From 5087ed1aff98463534bf05754c0f503f5eb16e56 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Fri, 31 May 2024 16:21:01 +0530 Subject: [PATCH] GWM --- app/Controllers/MasterController.php | 13 ++++++++----- app/Models/ClientDocsModel.php | 2 +- app/Views/client_docs_preview.php | 6 ++++++ app/Views/client_home.php | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 84b27fb..63f093e 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -237,21 +237,24 @@ class MasterController extends BaseController public function client_docs_preview() { + if($this->session->has('is_staff_logged_in')){ + $userData = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); + }else if($this->session->has('is_client_logged_in')){ + $userData = $this->ClientModel->where('client_id',$this->session->get('is_client_logged_in'))->get()->getRow(); + } $doc_id = $this->request->getVar('doc_id'); $data['docData'] = $this->ClientDocsModel->docPreview($doc_id); - $clientData = $this->ClientModel->where('client_id',$data['docData']->client_id)->get()->getRow(); + $data['clientData'] = $this->ClientModel->where('client_id',$data['docData']->client_id)->get()->getRow(); $data['body_html'] = $data['docData']->body_html; - foreach ($clientData as $key => $value) { + foreach ($data['clientData'] as $key => $value) { $placeHolder = '%'.$key.'%'; $data['body_html'] = str_replace($placeHolder,$value,$data['body_html']); } - - $staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); - echo view('layout/header', ['Data'=>$staffdata]); + echo view('layout/header', ['Data'=>$userData]); echo view('client_docs_preview',$data); echo view('layout/footer'); diff --git a/app/Models/ClientDocsModel.php b/app/Models/ClientDocsModel.php index af5b99a..a2f9f50 100644 --- a/app/Models/ClientDocsModel.php +++ b/app/Models/ClientDocsModel.php @@ -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 ,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,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 dfdbf9d..ff758d8 100644 --- a/app/Views/client_docs_preview.php +++ b/app/Views/client_docs_preview.php @@ -16,7 +16,9 @@
Close Reject + is_approved != 1){ ?> Approve +
@@ -39,6 +41,10 @@ + +
+ 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' ; } ?> +
diff --git a/app/Views/client_home.php b/app/Views/client_home.php index cec4d34..31975c9 100644 --- a/app/Views/client_home.php +++ b/app/Views/client_home.php @@ -55,7 +55,7 @@ - Preview + Preview