Bigbamboo/bbone
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:venbaittech/ams

Browse Source
This commit is contained in:
suseendhiran17 2023-01-18 10:01:53 +05:30
commit 1f69a60ba7
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/core/MY_Model.php
View File

@ -265,7 +265,13 @@ function getData($table,$id,$business_id)
$this->db->select(); $this->db->select();
$this->db->from($table); $this->db->from($table);
if($business_id != NULL) { if($business_id != NULL) {
$this->db->where('business_id', $business_id); if($table == 'business')
{
$this->db->where('uid', $business_id);
}
else {
$this->db->where('business_id', $business_id);
}
} }
$this->db->where('id', $id); $this->db->where('id', $id);
$query = $this->db->get(); $query = $this->db->get();

4
application/modules/Asset/views/asset_sub_value_list.php
View File

@ -67,8 +67,8 @@
<i class="fa fa-pencil"></i></a> <i class="fa fa-pencil"></i></a>
&nbsp; &nbsp;
<a href="<?php echo base_url()?>Asset/deleteAssetValue/<?php echo md5($value->id)."_".$value->asset_id;?>" style="font-size: 16px;"><i class="fa fa-trash"></i></a> <a href="<?php echo base_url()?>Asset/deleteAssetValue/<?php echo md5($value->id)."_".$value->asset_id;?>" style="font-size: 16px;"><i class="fa fa-trash"></i></a>
&nbsp;
<a class="asset_value_history" id="<?php echo md5($value->id); ?>" data-toggle="modal" data-target=".bs-example-modal-sm" style="font-size: 16px;" ><i class="fa fa-eye"></i></a>
</td> </td>
</tr> </tr>
<?php } ?> <?php } ?>

7
application/modules/Business/views/edit_business.php
View File

@ -57,12 +57,7 @@
</div> </div>
</div> </div>
<div class="item form-group">
<label class="control-label col-md-1 col-sm-1 " for="last-name">Status <a style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 ">
<input id="status" name="status" value="<?php echo $businessData->status; ?>" required="required" class="form-control" type="text" >
</div>
</div>
<br /> <div class="x_title"> </div> <br /> <br /> <div class="x_title"> </div> <br />

11
application/modules/Dashboard/controllers/Dashboard.php
View File

@ -37,7 +37,7 @@ public function __construct()
*/ */
public function index() public function index()
{ {
//echo date('Y-m-d', strtotime('+60 day', strtotime(date("Y-m-d")))); die();
if(is_admin()) if(is_admin())
{ {
$asset_count = $this->Dashboard_model->get_assets_count(user()->business_id); $asset_count = $this->Dashboard_model->get_assets_count(user()->business_id);
@ -58,19 +58,12 @@ public function index()
$expired_insurance_count = $this->Dashboard_model->get_expired_insurance_count(user()->business_id); $expired_insurance_count = $this->Dashboard_model->get_expired_insurance_count(user()->business_id);
$this->layout->set('expired_insurance_count', $expired_insurance_count); $this->layout->set('expired_insurance_count', $expired_insurance_count);
$amc = $this->Dashboard_model->get_amc(user()->business_id); $amc = $this->Dashboard_model->get_amc(user()->business_id);
//print_r(json_encode($amc));
$this->layout->set('amc', $amc); $this->layout->set('amc', $amc);
//echo "</br></br></br>";
$insurence = $this->Dashboard_model->get_insurence(user()->business_id); $insurence = $this->Dashboard_model->get_insurence(user()->business_id);
//print_r(json_encode($insurence));die();
$this->layout->set('insurence', $insurence); $this->layout->set('insurence', $insurence);
} }
else if(is_superadmin()) else if(is_superadmin())
{ {
$user_count = $this->Dashboard_model->get_users_count(user()->business_id); $user_count = $this->Dashboard_model->get_users_count(user()->business_id);