From 8a9328075ea5c3a44c1e53f5b9c6be1b386df70a Mon Sep 17 00:00:00 2001
From: unknown <aadhavanvalli@gmail.com>
Date: Wed, 12 Jun 2024 14:11:10 +0530
Subject: [PATCH] CHANGE_CLIENT_LOGIN_BY_GST : AADHAVAN

---
 app/Controllers/ClientController.php | 2 +-
 app/Controllers/MasterController.php | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 4eb227c..af01496 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -83,7 +83,7 @@ class ClientController extends BaseController
         $client_id =$this->session->get('is_client_logged_in');
         
         $data['doc_list'] =  $this->ClientDocsModel->getTemplate($client_id);
-        // print_r($client_id);die;
+        // print_r($data['doc_list']);die;
 
         $clientdata = $this->ClientBranchModel->where('id', $client_id)->get()->getRow();
 
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 2fde885..1c09774 100644
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -265,11 +265,7 @@ class MasterController extends BaseController
 
 
            
-            $data['doc_list'] =  $this->ClientDocsModel->select('client_docs.* , services.service_name , service_group.group_name')
-                                                        ->join('template', 'template.template_id = client_docs.template_id', 'left')
-                                                        ->join('services', 'services.service_id = template.service_id', 'left')
-                                                        ->join('service_group', 'service_group.service_group_id = template.service_group_id', 'left')
-                                                        ->findAll();
+            $data['doc_list'] =  $this->ClientDocsModel->getDocs();
       
             $data['clientdata'] =  $this->ClientBranchModel->select('client.name as client_name , client_branch.name as client_branch_name , client_branch.id as client_branch_id')
                                                            ->join('client', 'client_branch.client_id = client.client_id', 'left')
@@ -309,7 +305,6 @@ class MasterController extends BaseController
         $docData = $this->request->getVar();
         $docData['created_by'] = $this->session->has('is_staff_logged_in');  
         $docData['body_html'] = $this->TemplateModel->where('template_id',$this->request->getVar('template_id'))->get()->getRow()->body_html;
-        $docData['template_name'] = $this->TemplateModel->where('template_id',$this->request->getVar('template_id'))->get()->getRow()->template_name;
         $insert = $this->ClientDocsModel->insert($docData);
 
         if($insert){