diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index ebf26139..14cee4da 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -2311,6 +2311,9 @@ class EmployeeRestController extends AdminController $emp_policy_status = 'active'; } + $db = \Config\Database::connect(); + $emp_policy_status = $db->escape($emp_policy_status); + $ClientPolicyData = $this->clientPolicyModel ->select(" client_policy.id as client_policy_id , @@ -2327,10 +2330,10 @@ class EmployeeRestController extends AdminController select round(sum(rata_premimum + gst)) from employee_polices where is_active = 1 - and status = $emp_policy_status - and client_policy_id = client_policy_id + and status = $emp_policy_status + and client_policy_id = client_policy.id ) as total_premium - ") + ", false) ->where('md5(client_policy.client_id)', $this->request->getGet('client_id')) ->where('client_policy.client_branch_id', $this->request->getGet('client_branch_id')) ->where('client_policy.is_active', 1) @@ -2470,6 +2473,7 @@ class EmployeeRestController extends AdminController $data['claim_status'] = $this->claimStatusModel ->select('id,ticket_type, display_name as claim_status') ->where('is_active', 1) + ->where('display_name IS NOT NULL OR display_name <> ""') ->groupBy('display_name') ->findAll();