Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
resicovenba 2018-01-25 12:13:29 +05:30
commit 2a0c2478b7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apollo/api/application/models/Calltracking_model.php
View File

@ -181,13 +181,15 @@ class Calltracking_model extends CI_Model {
$this->db->select('LO.ID,ST.StaffID,ST.Firstname'); $this->db->select('LO.ID,ST.StaffID,ST.Firstname');
$this->db->from(LOGIN.' as LO'); $this->db->from(LOGIN.' as LO');
$this->db->join(STAFF_BRANCH.' as STB', 'STB.StaffID = LO.StaffID');
$this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID'); $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID');
$this->db->where('ST.IsActive',$status); $this->db->where('ST.IsActive',$status);
if($userType== ADMIN){ if($userType== ADMIN){
$this->db->where('ST.BranchCode',$branchID); $this->db->where('STB.BranchCode',$branchID);
$this->db->where('LO.ListCode !=',SUPER_ADMIN); $this->db->where('LO.ListCode !=',SUPER_ADMIN);
} }
if($userType== EMPLOYEE){ if($userType== EMPLOYEE){
$this->db->where('STB.BranchCode',$branchID);
$this->db->where('LO.ID',$requestedBy); $this->db->where('LO.ID',$requestedBy);
} }
$staffDetails=$this->db->get(); $staffDetails=$this->db->get();
@ -238,10 +240,10 @@ class Calltracking_model extends CI_Model {
$this->db->select('LO.ID,ST.StaffID,ST.Firstname'); $this->db->select('LO.ID,ST.StaffID,ST.Firstname');
$this->db->from(LOGIN.' as LO'); $this->db->from(LOGIN.' as LO');
$this->db->join(STAFF_BRANCH.' as STB', 'STB.StaffID = LO.StaffID');
$this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID'); $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID');
$this->db->where('ST.IsActive',$status); $this->db->where('ST.IsActive',$status);
$this->db->where('STB.BranchCode',$branchID);
$this->db->where('ST.BranchCode',$branchID);
$staffDetails=$this->db->get(); $staffDetails=$this->db->get();
if($staffDetails){ if($staffDetails){
$result_staff = array(); $result_staff = array();