CHANGE_CLIENT_LOGIN_BY_GSTCONFLICT_MERAGE : AADHAVAN

This commit is contained in:
unknown 2024-06-12 17:19:18 +05:30
commit 9cdc8f8915
2 changed files with 17 additions and 6 deletions

View File

@ -265,8 +265,14 @@ class MasterController extends BaseController
$data['doc_list'] = $this->ClientDocsModel->getDocs();
$data['doc_list'] = $this->ClientDocsModel->select('client_docs.* , services.service_name , service_group.group_name , client_branch.name as client_branch_name , client.name as client_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')
->join('client_branch', 'client_branch.id = client_docs.client_branch_id', 'left')
->join('client', 'client.client_id = client_branch.client_id', 'left')
->findAll();
$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'))

View File

@ -24,7 +24,6 @@
<h4 class="page-title">Share Documents</h4>
<div class="page-title-right">
<button type="reset" onclick="window.history.back()" class="btn btn-secondary waves-effect"> Back </button>
<a href="javascript:void(0);" data-toggle="modal" data-target="#bs-example-modal-lg" class="btn btn-primary waves-effect waves-light">Share Docs </a>
</div>
</div>
@ -45,7 +44,10 @@
<table id="datatable-buttons" class="table table-striped dt-responsive nowrap w-100 display">
<thead>
<tr>
<th>Service</th>
<th>Client Name</th>
<th>Client Branch Name</th>
<th>Service Group</th>
<th>Service Name</th>
<th>Document Name</th>
<th>Doc Status</th>
<th>Action</th>
@ -58,8 +60,11 @@
<?php foreach ($doc_list as $key => $value) { ?>
<tr>
<td> <?php echo $value['service_name']; ?></td>
<td> <?php echo $value['document_name']; ?></td>
<td> <?php echo $value['client_name']; ?></td>
<td> <?php echo $value['client_branch_name']; ?></td>
<td> <?php echo $value['group_name']; ?></td>
<td> <?php echo $value['service_name']; ?></td>
<td> <?php echo $value['document_name']; ?></td>
<td>
<?php if ($value['is_active'] == 1){ ?>