diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 166322c9..6d8863bc 100644 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -65,12 +65,12 @@ class DayBook_model extends CI_Model $toDate = $dTo->format('Y-m-d'); $reqpayType = $reqDataBy['localBranchID']; - $querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName , t5.Firstname as Approved_by_name , + $querys = "SELECT t5.Firstname as Fname,t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName , t5.Firstname as Approved_by_name , t7.UniversityName as UniversityName, t6.CourseName as CourseName,t7.UniversityID,t8.Lastname,t8.MobileNumber FROM ".DAYBOOKMASTER." as t1 LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type AND t3.BranchCode = t1.BranchCode - LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By + LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.CreatedBy LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode @@ -93,12 +93,12 @@ class DayBook_model extends CI_Model // $this->db->order_by('CreatedOn', 'DESC'); // $this->db->where('t1.BranchCode', $reqDataBy['localBranchID']); $reqpayType = $reqDataBy['localBranchID']; - $querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name , + $querys = "SELECT t5.Firstname,t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name , t7.UniversityName as UniversityName, t6.CourseName as CourseName,t7.UniversityID,t8.Lastname,t8.MobileNumber FROM ".DAYBOOKMASTER." as t1 LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type AND t3.BranchCode = t1.BranchCode - LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By + LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.CreatedBy LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode @@ -106,12 +106,16 @@ class DayBook_model extends CI_Model WHERE t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC"; } + + + // $this->db->join('' . COURSE . ' as t2', 't2.UniversityID = t1.UniversityID', 'LEFT'); $dayBookDetails = $this->db->query($querys); $dayBookDetailsList = $dayBookDetails->result(); $results['dayBookListStatus'] = true; $results['dayBookListDetails'] = $dayBookDetailsList; + //print_r($this->db->last_query());die; return $results; } diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 0a71bf0e..822ef44b 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -169,6 +169,8 @@ Comments Reason + + Fee Collected by Status @@ -200,6 +202,7 @@
{{p.ReceiptNoComments}}{{p.Description}}
{{p.Reason}} + {{p.Fname}} {{p.Status}}