diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 82ecc855..d3ec1b95 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -267,7 +267,7 @@ class Calltracking_model extends CI_Model { $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus'); $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode'); $this->db->where('LTF.IsActive', '1'); - if($search['CreatedBranch'] !='All'){ + if($search['CreatedBranch'] !='All' AND $search['requestedDept'] != EMPLOYEE){ $this->db->where('LT.CreatedBranch', $search['CreatedBranch']); } @@ -357,7 +357,7 @@ class Calltracking_model extends CI_Model { $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus'); $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode'); $this->db->where('LTF.IsActive', '1'); - if($search['CreatedBranch'] !='All'){ + if($search['CreatedBranch'] !='All' AND $search['requestedDept'] != EMPLOYEE){ $this->db->where('LT.CreatedBranch', $search['CreatedBranch']); } @@ -506,7 +506,7 @@ class Calltracking_model extends CI_Model { $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus'); $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode'); $this->db->where('LT.TrackingID',$trackingID['TrackingID']); - if($trackingID['CreatedBranch'] !='All'){ + if($trackingID['CreatedBranch'] !='All' AND $trackingID['requestedDept'] != EMPLOYEE){ $this->db->where('LT.CreatedBranch', $trackingID['CreatedBranch']); } @@ -581,7 +581,7 @@ class Calltracking_model extends CI_Model { $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = LT.StatusCode'); $this->db->where('LD.MobileNumber',$stuMobile); - if($branchId !='All'){ + if($branchId !='All' AND $reqDept != EMPLOYEE){ $this->db->where('LT.CreatedBranch', $branchId); } @@ -662,7 +662,7 @@ class Calltracking_model extends CI_Model { $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID'); $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus'); $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode'); - if($search['BranchID'] !='All'){ + if($search['BranchID'] !='All' AND $search['requestedDept'] != EMPLOYEE){ $this->db->where('LT.CreatedBranch', $search['BranchID']); } @@ -713,7 +713,7 @@ class Calltracking_model extends CI_Model { $this->db->join(ACTIVITY.' as AV', 'AV.ActivityID = LT.ActivityStatus'); $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode'); $this->db->where('LTF.IsActive', '1'); - if($search['BranchID'] !='All'){ + if($search['BranchID'] !='All' AND $search['requestedDept'] != EMPLOYEE){ $this->db->where('LT.CreatedBranch', $search['BranchID']); } @@ -765,7 +765,7 @@ class Calltracking_model extends CI_Model { $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode'); $this->db->where('LTF.IsActive', '1'); $this->db->where('PLD1.ListName !=', $status); - if($search['BranchID'] !='All'){ + if($search['BranchID'] !='All' AND $search['requestedDept'] != EMPLOYEE){ $this->db->where('LT.CreatedBranch', $search['BranchID']); } diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 56f6d410..c5cc3976 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -917,7 +917,7 @@ class Fees_status_model extends CI_Model $insertArray['CreatedOn'] = $data['CreatedOn']; $insertArray['Description'] = $data['InternalComments']; $insertArray['Amount'] = $data['BillAmount']; - $insertArray['Status'] = 'Pending'; + $insertArray['Status'] = 'Approved'; $insertArray['BranchCode'] = $data['UpdatedBy'];