diff --git a/app/Config/Routes.php b/app/Config/Routes.php index dd373780..deff1f0c 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -572,7 +572,7 @@ $routes->group("employeeRest", ['filter' => ["appSignature"] ], function ($route }); -$routes->group("employeeRest", ["filter" => ["authJWT" , "appSignature"]], function ($routes) { +$routes->group("employeeRest", ["filter" => ["authJWT"]], function ($routes) { $routes->post("ecardRequest", "ApiServiceController::ecardRequest"); $routes->get("getWellnessURL", "ApiServiceController::getWellnessURL"); diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 4fb1aeda..91e14598 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -4647,17 +4647,17 @@ class EmployeeRestController extends AdminController if (!empty($emp_id)) { $emp_retail_policy_data = $this->employeeRetailPolicy - ->select(' + ->select(" employee_retail_policies.emp_id, employee_retail_policies.insurer_id, employee_retail_policies.policy_type_id, employee_retail_policies.policy_no, - employee_retail_policies.policy_start_date, - employee_retail_policies.policy_end_date, + DATE_FORMAT(employee_retail_policies.policy_start_date, '%d-%b-%Y') as policy_start_date, + DATE_FORMAT(employee_retail_policies.policy_end_date, '%d-%b-%Y') as policy_end_date, policy_type.policy_type, policy_type.long_name as policy_type_name, insurers.name as insurer_name - ') + ") ->join('insurers', 'employee_retail_policies.insurer_id = insurers.id') ->join('policy_type', 'employee_retail_policies.policy_type_id = policy_type.id') ->where('is_active', 1) @@ -4674,8 +4674,8 @@ class EmployeeRestController extends AdminController policy_transaction.insurer_id policy_transaction.policy_type_id policy_transaction.policy_no - policy_transaction.policy_start_date - policy_transaction.policy_end_date + DATE_FORMAT(policy_transaction.policy_start_date, '%d-%b-%Y') as policy_start_date, + DATE_FORMAT(policy_transaction.policy_end_date, '%d-%b-%Y') as policy_end_date, policy_type.policy_type, policy_type.long_name as policy_type_name, insurers.name as insurer_name