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:
gandhimathi 2018-10-04 16:38:53 +05:30
commit e9e0918134
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/models/Reports_model.php
View File

@ -976,7 +976,7 @@ from T_Lead_Tracking_Followup as ltf
"; ";
} }
if ($ass != ''){ if ($ass != ''){
$sql.=" and sd.StaffID >= '".$ass."' $sql.=" and sd.StaffID = '".$ass."'
"; ";
} }
if ($from != ''){ if ($from != ''){
@ -1304,7 +1304,7 @@ if($feeDetails)
//staff Name //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=$this->db->query($sql_staf);
$staff_list = $staff->result(); $staff_list = $staff->result();

1
Apollo/assets/views/report_waiver_referal.html
View File

@ -141,6 +141,7 @@
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td>
<td>Total</td> <td>Total</td>
<td></td> <td></td>
<td></td> <td></td>