From 73af47e38c5c6bc42421fa3935e82b410f374fa8 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Sat, 1 Jun 2024 09:32:43 +0530 Subject: [PATCH] CHANGE_CLIENT_DOC_PREVIEW : AADHAVAN --- app/Config/Routes.php | 6 +- app/Controllers/ClientController.php | 25 ++- app/Controllers/MasterController.php | 57 ++++++- app/Models/ClientDocsModel.php | 4 +- app/Views/client_docs_preview.php | 232 ++++++++++++++++++++++++++- app/Views/client_home.php | 17 -- app/Views/client_login.php | 3 +- app/Views/layout/header.php | 3 + 8 files changed, 316 insertions(+), 31 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index ce29445..c3c8220 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -32,8 +32,9 @@ use CodeIgniter\Router\RouteCollection; $routes->post('verify_otp_client','ClientController::verify_otp'); $routes->get('client_home','ClientController::client_home'); $routes->post('status_client','ClientController::status_client'); + $routes->post('doc_rejection','ClientController::doc_rejection'); - + $routes->match(['get','post'],'/service_list','MasterController::service_list'); $routes->match(['get','post'],'/service_create','MasterController::service_create'); @@ -52,7 +53,10 @@ use CodeIgniter\Router\RouteCollection; $routes->match(['get','post'],'/test','MasterController::test'); + $routes->post('doc_generate_otp','MasterController::doc_generate_otp'); + $routes->post('doc_verify_otp','MasterController::doc_verify_otp'); + diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 368bf19..ea7eb20 100644 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -188,13 +188,9 @@ class ClientController extends BaseController return json_encode(true); } } else { - $client_data = $this->ClientModel->where('pan_no', $pan_no )->first(); - $id = $client_data['client_id']; - - $update = $this->ClientModel->update($id , $data); - return false; + return ; } } catch (\Exception $e) { // Handle any exceptions that occur during execution @@ -228,5 +224,24 @@ class ClientController extends BaseController } + public function doc_rejection() + { + $id = $this->request->getPost('doc_id'); + $data=[ + 'rejection_reason' => $this->request->getPost('rejection_reason'), + 'is_approved' => $this->request->getPost('is_approved') + ]; + + if($id){ + $update =$this->ClientDocsModel->update($id, $data); + + if ($update) { + return json_encode(true); + } + } + + return ; + + } } diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 63f093e..159cd27 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -253,7 +253,7 @@ class MasterController extends BaseController $data['body_html'] = str_replace($placeHolder,$value,$data['body_html']); } - + echo view('layout/header', ['Data'=>$userData]); echo view('client_docs_preview',$data); echo view('layout/footer'); @@ -283,14 +283,69 @@ class MasterController extends BaseController } + public function doc_generate_otp() + { + try { + $mobile_no = $this->request->getPost('mobile_no'); + + $client_data = $this->ClientModel->where('mobile_no', $mobile_no )->first(); + + + if($client_data){ + + $id = $this->request->getPost('doc_id'); + $data = [ + 'otp' => '123456' , + 'ip_address' => $this->request->getPost('clientIp') + ]; + $update = $this->ClientDocsModel->update($id, $data); + + if($update){ + return json_encode(true); + } + } else { + return false; + } + } catch (\Exception $e) { + // Handle any exceptions that occur during execution + return $this->respond(['status' => 'error', 'code' => 500, 'message' => $e->getMessage()], 500); + } + } + + // str_replace("%name%","Gowtham",$data['templateData']->body_html); + + + public function doc_verify_otp() + { + try { + $id = $this->request->getPost('doc_id'); + $otp = $this->request->getPost('otp'); + + $client_doc_data = $this->ClientDocsModel->where('id', $id )->where('otp', $otp)->first(); + $data = ['otp' =>'' ,'rejection_reason' =>'']; + + if($client_doc_data){ + $data['is_approved']=$this->request->getPost('is_approved'); + $update = $this->ClientDocsModel->update($id , $data); + if($update){ + return json_encode(true); + } + } else { + return json_encode(''); + } + } catch (\Exception $e) { + // Handle any exceptions that occur during execution + return $this->respond(['status' => 'error', 'code' => 500, 'message' => $e->getMessage()], 500); + } + } diff --git a/app/Models/ClientDocsModel.php b/app/Models/ClientDocsModel.php index a2f9f50..8b57945 100644 --- a/app/Models/ClientDocsModel.php +++ b/app/Models/ClientDocsModel.php @@ -7,7 +7,7 @@ class ClientDocsModel extends Model protected $table = 'client_docs'; protected $primaryKey = 'id'; - protected $allowedFields = ['client_id','template_id','is_active' ,'created_by','updated_by']; + protected $allowedFields = ['client_id','template_id','rejection_reason','is_approved','otp','ip_address','is_active' ,'created_by','updated_by']; @@ -37,7 +37,7 @@ class ClientDocsModel extends Model public function docPreview($doc_id){ - $this->select('client_docs.is_approved ,client_docs.id as doc_id,client_docs.client_id ,client_docs.updated_at,template.template_name,template.body_html , services.service_name'); + $this->select('client_docs.is_approved ,client_docs.id as doc_id,client_docs.client_id ,client_docs.updated_at,client_docs.ip_address,template.template_name,template.body_html , services.service_name'); $this->join('template', 'template.template_id = client_docs.template_id'); $this->join('services', 'services.service_id = template.service_id'); $this->where('client_docs.id', $doc_id); diff --git a/app/Views/client_docs_preview.php b/app/Views/client_docs_preview.php index ff758d8..b7149bd 100644 --- a/app/Views/client_docs_preview.php +++ b/app/Views/client_docs_preview.php @@ -2,7 +2,12 @@ - +
@@ -15,9 +20,9 @@

service_name; ?>

Close - Reject + Reject is_approved != 1){ ?> - Approve + Approve
@@ -43,7 +48,7 @@
- is_approved == 1){ echo 'Approved at '.date('d-m-Y H:i:s', strtotime($docData->updated_at)).' through OTP sent to '.$clientData->mobile_no.' from ip address 119.22.334' ; } ?> + is_approved == 1){ echo 'Approved at '.date('d-m-Y H:i:s', strtotime($docData->updated_at)).' through OTP sent to '.$clientData->mobile_no.' from ip address '.$docData->ip_address; } ?>
@@ -59,7 +64,226 @@ + + + + + + + + + + diff --git a/app/Views/client_home.php b/app/Views/client_home.php index 31975c9..8ea6e48 100644 --- a/app/Views/client_home.php +++ b/app/Views/client_home.php @@ -82,20 +82,3 @@ - - - \ No newline at end of file diff --git a/app/Views/client_login.php b/app/Views/client_login.php index de013f5..d661c42 100644 --- a/app/Views/client_login.php +++ b/app/Views/client_login.php @@ -165,6 +165,8 @@ $('#otp_hide').show(); $('#verify_otp_hide').show(); $('#pan_no').attr('readonly', true); + $('#resend_reenter_otp_hide').show(); + }else{ pan_error.html('PAN number mismatch. Please try again.'); pan_error.css('color','red'); @@ -199,7 +201,6 @@ $('#client_login_form').submit(); }else{ - $('#resend_reenter_otp_hide').show(); $('#pan_error').html('OTP Mismatch. Please try again.').css('color','red'); $('#otp').val(''); diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 3bff760..b3cc7b6 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -38,6 +38,9 @@ /assets/libs/summernote/summernote-bs4.min.css" rel="stylesheet" type="text/css" /> + + /assets/libs/admin-resources/jquery.vectormap/jquery-jvectormap-1.2.2.css" rel="stylesheet" type="text/css" /> +