diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php index f5ade0fb..3c7b8860 100644 --- a/app/Controllers/EmpDataServiceController.php +++ b/app/Controllers/EmpDataServiceController.php @@ -1221,6 +1221,7 @@ class EmpDataServiceController extends BaseController //Endorsement Correction + public function importCorrectionValidation($params) { diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index b652d3eb..8afffb88 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -190,6 +190,11 @@ class MasterController extends AdminController $uploadFilePath = ROOTPATH . 'public/uploads/logo/'; $file_name = file_Upload($this->request->getFile('insurer_logo'), $uploadFilePath); $data = $this->request->getPost(); + + if($this->request->getPost('addition_add_day')){ + $data['addition_add_day'] = 1; + } + $data['created_by'] = get_session_userid(); $data['insurer_logo'] = $file_name; @@ -265,6 +270,12 @@ class MasterController extends AdminController $data['insurer_logo'] = $file_name; } + if($this->request->getPost('addition_add_day')){ + $data['addition_add_day'] = 1; + }else{ + $data['addition_add_day'] = 0; + } + $update = $this->insurerModel->update($id,$data); if($update){ echo json_encode(array("status" => true , 'data' => $data)); diff --git a/app/Filters/AuthJWT.php b/app/Filters/AuthJWT.php index 456b2e6f..193ad6ec 100644 --- a/app/Filters/AuthJWT.php +++ b/app/Filters/AuthJWT.php @@ -12,6 +12,7 @@ use ReflectionClass; require_once('../vendor/autoload.php'); +use App\Models\EmployeeModel; class AuthJWT implements FilterInterface @@ -19,27 +20,27 @@ class AuthJWT implements FilterInterface public function before(RequestInterface $request, $arguments = null) { $jwt = $request->getHeader('Authorization'); + $model = new EmployeeModel(); if ($jwt) { if (JWTToken::validateJWT($jwt)) { $data = JWTToken::validateJWT($jwt); $data = json_decode($data); + + $id = $data->decoded->id; + $user_data = $model->where('id', $id)->first(); - if ($data->status) { - // $auth = $request->getHeader("Authorization"); - // $decodedToken = $data->decoded; - - // $decodedToken->exp += 30; - // $newJwt = JWTToken::encode((array)$decodedToken); - - // Set the new JWT in the response headers - // $response = service('response'); - // $response->setHeader('Authorization', $newJwt); + if($user_data['token_time_out'] > time()){ + $data =["token_time_out" => time() + getenv('TOKENTIMEOUT') ]; + $model->update($id, $data); return true; }else{ + $data =["token_time_out" => '']; + $model->update($id, $data); header('Content-Type: application/json'); http_response_code(401); - $error = json_encode(["status" => 401, "message" => $data->message]); + // $error = json_encode(["status" => 401, "message" => $data->message]); + $error = json_encode(["status" => 401, "message" => "Token is Invalid"]); echo $error; exit; } diff --git a/app/Helpers/JWTToken.php b/app/Helpers/JWTToken.php index dc381fa1..592c38f8 100644 --- a/app/Helpers/JWTToken.php +++ b/app/Helpers/JWTToken.php @@ -12,27 +12,28 @@ use Firebase\JWT\SignatureInvalidException; use CodeIgniter\HTTP\RequestInterface; use ReflectionClass; +use App\Models\EmployeeModel; class JWTToken { public static function encode($data =null) { - $secret_Key="secret"; - $iat = time(); - $exp = $iat + 180; - $request_data = [ - "iat" => $iat, - "exp" => $exp, - ]; - if ($data !== null) { - $request_data = array_merge($request_data, (array)$data); - } - try{ - $token = JWT::encode($request_data ,$secret_Key,'HS512'); + $secret_Key ="secret"; - return $token; - // return ['status' => true,'token' => $token]; + $request_data = (array)$data; + + try{ + $token = JWT::encode($request_data ,$secret_Key,'HS512'); + + $model = new EmployeeModel(); + $id = $request_data['id']; + $data =[ + "token_time_out" => time() + getenv('TOKENTIMEOUT') + ]; + $model->update($id, $data); + + return $token; } catch (Exception $e) { return ['status' => false,'message' => $e->getMessage()]; diff --git a/app/Helpers/excel_import_export_helper.php b/app/Helpers/excel_import_export_helper.php index c7cec62d..65e44eaa 100644 --- a/app/Helpers/excel_import_export_helper.php +++ b/app/Helpers/excel_import_export_helper.php @@ -212,10 +212,10 @@ if (! function_exists('transform_objects_to_array_for_si_enhancement')) { $obj->no_of_days, $obj->old_si_premium, $obj->new_si_premium, - $obj->difference_premium, + round($obj->difference_premium, 2), $obj->pro_rata_premimum, $obj->gst, - $obj->total , + round($obj->total, 2), $endorsement_id, ]; diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php index b9a78696..cbde9e88 100644 --- a/app/Models/EmployeeModel.php +++ b/app/Models/EmployeeModel.php @@ -38,7 +38,8 @@ class EmployeeModel extends Model "file_id", "is_addon_value", "is_createdby_hr", - "client_branch_id" + "client_branch_id", + "token_time_out" ]; // Callbacks diff --git a/app/Views/batch_list.php b/app/Views/batch_list.php index e55bc755..0b28f477 100644 --- a/app/Views/batch_list.php +++ b/app/Views/batch_list.php @@ -18,7 +18,7 @@
| SNO | @@ -48,7 +48,7 @@- 5 ? substr($file['file_name'], 0, 10) . "..." : $file['file_name'] ?> + | @@ -58,11 +58,9 @@ | - | - | - - 5 ? substr(date('d-M-Y H:i:a', strtotime($file['created_at'])), 0, 6) . "..." : $file['created_at'] ?> - + | + | + by |
diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php
index f1f3d935..f59eb1c7 100644
--- a/app/Views/employee_data_list.php
+++ b/app/Views/employee_data_list.php
@@ -24,8 +24,16 @@
.table-responsive {
overflow-x: auto;
}
+
+.word-wrap {
+ word-wrap: break-word;
+ white-space: normal;
+}
+
+
+
@@ -37,7 +45,7 @@
-
|
|---|