This commit is contained in:
bitbucket 2024-06-13 14:43:12 +05:30
parent 4ab65cbeef
commit 5c72e37b58
3 changed files with 3 additions and 9 deletions

View File

@ -288,7 +288,7 @@ class MasterController extends BaseController
$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')
->where('client.business_id',$this->session->get('logged_in_staff_business_id'))
// ->where('client.business_id',$this->session->get('logged_in_staff_business_id'))
->findAll();
$data['serviceGroupData'] = $this->ServiceGroupModel->findAll();

View File

@ -163,11 +163,7 @@ class StaffController extends BaseController
if(!$this->session->has('is_staff_logged_in')){ return redirect()->to(base_url().'staff'); }
$data['clientList'] = $this->ClientModel->select('client.* , COUNT(client_docs.id) as docs_count')
->join('client_docs', 'client.client_id = client_docs.client_branch_id', 'left')
->where('client.branch_id',$this->session->get('logged_in_staff_branch_id'))
->groupBy('client.client_id')
->findAll();
$data['clientList'] = $this->ClientModel->findAll();
$staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow();
echo view('layout/header', ['Data'=>$staffdata]);

View File

@ -46,7 +46,6 @@
<th>PAN</th>
<th>Mobile</th>
<th>Email</th>
<th>Shared Docs</th>
<th>Status</th>
<th>Action</th>
</tr>
@ -62,7 +61,6 @@
<td> <?php echo $value['pan_no']; ?></td>
<td><?php echo $value['mobile_no']; ?></td>
<td><?php echo $value['email']; ?></td>
<td><?php echo $value['docs_count']; ?></td>
<td>
<?php if($value['is_active'] == 1): ?>
<span style="color:green">Active</span>
@ -82,7 +80,7 @@
<a class="dropdown-item" data-id="<?php echo $value['client_id']; ?>" data-isactive="<?php echo $value['is_active']; ?>" title="Activate" onclick="statusChange(this)"><i class="ri-shield-user-line" style="margin-right:10px"></i>Activate</a>
<?php endif; ?>
<a class="dropdown-item" href="<?= base_url()."shared_docs_list?client_id=".$value['client_id']; ?>" > <i class='mdi mdi-file-document-outline mr-1' style="margin-right: 16px !important;margin-left: 5px;"></i>Documents</a>
</div>
</div>