From 6ee00692c5c69f01740a662b765674426248995d Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Wed, 3 Oct 2018 17:14:19 +0530 Subject: [PATCH 1/2] waiver report --- Apollo/assets/views/report_waiver_referal.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html index f4938abb..7c97dc75 100755 --- a/Apollo/assets/views/report_waiver_referal.html +++ b/Apollo/assets/views/report_waiver_referal.html @@ -141,6 +141,7 @@ + Total From 24fa2c1aa14e03902edb68ce69c4be03c1f3a219 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Thu, 4 Oct 2018 12:58:17 +0530 Subject: [PATCH 2/2] filterchanges --- Apollo/api/application/models/Reports_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 3fd50ce4..583616eb 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -976,7 +976,7 @@ from T_Lead_Tracking_Followup as ltf "; } if ($ass != ''){ - $sql.=" and sd.StaffID >= '".$ass."' + $sql.=" and sd.StaffID = '".$ass."' "; } if ($from != ''){ @@ -1304,7 +1304,7 @@ if($feeDetails) //staff Name - $sql_staf = "select StaffID,concat(Firstname,Lastname) as staff_name from T_StaffDetails where BranchCode = '".$br."'"; + $sql_staf = "select StaffID,Firstname as staff_name from T_StaffDetails where BranchCode = '".$br."'"; $staff=$this->db->query($sql_staf); $staff_list = $staff->result();