diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 780a1edd..a32b6788 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -19,7 +19,7 @@ $routes->get('/logout', 'LoginController::logout'); $routes->get('/oauth2callback', 'LoginController::receiveGoogleOAuthResponse'); $routes->get('/auth/google', 'LoginController::initiateGoogleOAuth'); $routes->get('/update-emp-policy-status', 'ClientController::updateEmpAndPolicyStatus'); -$routes->get('download-e-card/(:segment)', 'EmployeeController::generateIDCardForEmployee/$1'); +$routes->get('download-e-card/(:any)', 'EmployeeController::generateIDCardForEmployee/$1'); $routes->get('download-kyc-docs/(:segment)', 'ClientController::downloadKYCDocument/$1'); diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php index 9ece093c..9ea04893 100644 --- a/app/Controllers/EmpDataServiceController.php +++ b/app/Controllers/EmpDataServiceController.php @@ -2266,12 +2266,12 @@ class EmpDataServiceController extends BaseController if($status == 'success'){ - $msg_txt = $data['short_name'] . ' - ' . $data['branch_name'] . ' - ' . $data['policy_name'] . ' - ' . $data['event_type'] . ' - ' . $data['actions'] . ' - ' . $data['insurer_or_tpa']; + $msg_txt = $data['client_name'] . '( ' . $data['branch_name'] . ' )' . ' - ' . $data['policy_name'] . ' - ' . $data['event_type'] . ' - ' . $data['actions'] . ' - ' . $data['insurer_or_tpa']; $msg_title = 'File Upload Success'; }else if ($status == 'failure'){ - $msg_txt = $data['short_name'] . ' - ' . $data['branch_name'] . ' - ' . $data['policy_name'] . ' - ' . $data['event_type'] . ' - ' . $data['actions'] . ' - ' . $data['insurer_or_tpa']; + $msg_txt = $data['client_name'] . '( ' . $data['branch_name'] . ' )' . ' - ' . $data['policy_name'] . ' - ' . $data['event_type'] . ' - ' . $data['actions'] . ' - ' . $data['insurer_or_tpa']; $msg_title = 'File Upload Failure'; } diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index 51a5ef50..77a14554 100644 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -877,8 +877,9 @@ class EmployeeController extends AdminController } - public function generateIDCardForEmployee($rand_string) - { + public function generateIDCardForEmployee($rand_string, $people = 0) + { + // dd($rand_string, $people); try { @@ -906,9 +907,13 @@ class EmployeeController extends AdminController $client_policy_id = $get_emp_code_and_client_policy_id['client_policy_id']; $emp_code = $get_emp_code_and_client_policy_id['emp_code']; - // $data['data'] = $this->employeePolicyModel->getECardDataUsingMd5($client_policy_id, $emp_code); + $data = $this->employeePolicyModel->getECardDataUsingMd5($client_policy_id, $emp_code); + if($people == 0){ + $data = $this->employeePolicyModel->getECardSingleData($rand_string, $emp_code); + } + // dd($data); $template_data_path = WRITEPATH . 'e_card_template/'; diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index bccd442b..2e7bcf23 100644 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -782,6 +782,72 @@ class EmployeePolicyModel extends Model return $result; + } + + + public function getECardSingleData($rand_string, $emp_code){ + + $result = $this->db->table('employees e') + ->select('e.id, + e.name, e.mobile, + e.relationship, + e.relationship_code, + e.emp_code, + e.email_personal, + e.email_corporate, + e.gender, + e.dob, + e.doj, + e.band, + TIMESTAMPDIFF(YEAR, e.dob, CURDATE()) AS emp_age, + (SELECT name FROM employees WHERE relationship = "Self" and emp_code = ' . $this->db->escape($emp_code) . ') AS self, + + + ep.tpa_id, + ep.uhid, + ep.policy_end_date, + + clients.client_name, + clients.short_name AS client_short_name, + + cp.policy_start_date, + cp.policy_no, + + policies.name AS policy_name, + + insurers.name AS insurer_name, + insurers.short_name AS insurer_short_name, + insurers.insurer_logo, + + insurer_branch.branch_name, + insurer_branch.branch_code, + insurer_branch.city as insurer_branch_city, + + tpa.name AS tpa_name, + tpa.tpa_logo AS tpa_logo, + tpa.front_card, + tpa.back_card, + tpa.short_name AS tpa_short_name' + ) + + ->join('employee_polices ep', 'ep.employee_id = e.id') + ->join('client_policy cp', 'cp.id = ep.client_policy_id') + ->join('clients', 'clients.id = cp.client_id') + ->join('policies', 'policies.id = cp.policy_id') + ->join('insurers', 'insurers.id = cp.insurer_id') + ->join('insurer_branch', 'insurer_branch.id = cp.insurer_branch_id') + ->join('tpa', 'tpa.id = cp.tpa_id') + ->where("ep.tpa_id IS NOT NULL AND ep.tpa_id <> ''") + ->where('e.emp_status', 'active') + ->where('e.is_active', '1') + ->where('ep.status', 'active') + ->where('ep.is_active', '1') + ->where('ep.rand_string', $rand_string) + ->get() + ->getResultArray(); + + return $result; + } diff --git a/app/Models/MessageModel.php b/app/Models/MessageModel.php index eac21cbe..6f2256a3 100644 --- a/app/Models/MessageModel.php +++ b/app/Models/MessageModel.php @@ -69,6 +69,7 @@ class MessageModel extends Model $builder->orWhere('messages.role_id', $roleId); $builder->orWhere('messages.team_id', $teamId); $builder->groupEnd(); + $builder->orderBy('id', 'desc'); $query = $builder->get(); return $query->getResult(); diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php index bb051d4e..a785c23b 100644 --- a/app/Views/layout/footer.php +++ b/app/Views/layout/footer.php @@ -48,9 +48,9 @@ -
+
- Pending Action + TO DOs