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:
sriramv 2023-01-13 13:59:27 +05:30
commit e4870e573d
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/modules/Business/views/business_list.php
View File

@ -58,7 +58,7 @@
<a href="<?php echo base_url()?>business/delete_business/<?php echo md5($value->id);?>" ><i class="fa fa-trash"></i></a>
&nbsp;
<a> <i id="<?php echo $value->id;?>" class="fa fa-eye"></i></a>
<a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye"></i></a>
</td>
</tr>

2
application/modules/User/controllers/User.php
View File

@ -47,7 +47,7 @@ public function userList()
$user_list = $this->user_model->get_admin();
}
else if(is_admin()) {
$user_list = $this->user_model->get_user(user()->business_id);
$user_list = $this->user_model->get_user( md5(user()->id) , user()->business_id);
}
$this->layout->set('tableData', $user_list);
$this->layout->buffer('main_content', 'User/user_list');

10
application/modules/User/models/User_model.php
View File

@ -1,13 +1,13 @@
<?php
class User_model extends MY_Model {
public function get_user($business_id)
public function get_user($id , $business_id)
{
$this->db->select('*');
$this->db->from('users');
$this->db->where('business_id', $business_id);
$this->db->order_by('id','DESC');
// $this->db->where('role', 'user');
$this->db->where('md5(id) !=', $id);
// $this->db->where('role', 'user');
// $this->db->where('is_active', 1);
$query = $this->db->get();
@ -42,7 +42,9 @@ public function get_user_by_md5_id($id,$business_id)
public function delete_user_by_md5_id($id,$business_id)
{
$this->db->where('md5(id)', $id);
$this->db->where('business_id', $business_id);
if ($business_id != NULL) {
$this->db->where('business_id', $business_id);
}
$this->db->set('is_active',0);
$this->db->update('users');
return;
@ -51,7 +53,9 @@ public function delete_user_by_md5_id($id,$business_id)
public function activate_inactive_users($id,$business_id)
{
$this->db->where('md5(id)', $id);
if ($business_id != NULL) {
$this->db->where('business_id', $business_id);
}
$this->db->set('is_active',1);
$this->db->update('users');
return;

4
application/modules/User/views/user_list.php
View File

@ -38,13 +38,13 @@
<a href="<?php echo base_url()?>user/deleteUser/<?php echo md5($value->id);?>" >
<i class="#008000 fa fa-check-circle" style="font-size:20px;" title="deactivate"></i></a>
&nbsp;
<a> <i id="<?php echo $value->id;?>" class="fa fa-eye"></i></a>
<a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye"></i></a>
<?php } ?>
<?php if ($value->is_active == 0) { ?>
<a href="<?php echo base_url()?>user/activateUser/<?php echo md5($value->id);?>" >
<i class="green fa fa-check-circle" style="font-size:20px;" title="activate"></i></a>
&nbsp;
<a> <i id="<?php echo $value->id;?>" class="fa fa-eye"></i></a>
<a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye"></i></a>
&nbsp;
<?php } ?>
</td>