diff --git a/api/application/models/DayBook_model.php b/api/application/models/DayBook_model.php index e0e9f2e..7b2d32c 100755 --- a/api/application/models/DayBook_model.php +++ b/api/application/models/DayBook_model.php @@ -127,8 +127,9 @@ class DayBook_model extends CI_Model AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') ORDER BY ORDER_ID DESC"; } else { $reqpayType = $reqDataBy['localBranchID']; - $querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name 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 - LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID + $querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name,t7.UniversityName as UniversityName, t6.CourseName as CourseName 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 + LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID + LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID WHERE t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') ORDER BY ORDER_ID DESC"; } diff --git a/assets/views/daybook/dayBookApproval.html b/assets/views/daybook/dayBookApproval.html index 8d1a1a3..22904bf 100755 --- a/assets/views/daybook/dayBookApproval.html +++ b/assets/views/daybook/dayBookApproval.html @@ -212,6 +212,10 @@ Paid To / Received From + + Sem/Course/University + + Description/Comments @@ -240,6 +244,8 @@ {{p.ListName}} {{p.VoucherNumber}} {{p.PaidTo}} + + {{p.FeePaymentDetails}}
{{p.CourseName}}
{{p.UniversityName}}