diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index b772f160..75bd3a9f 100644 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -94,7 +94,7 @@ class DayBook_model extends CI_Model // $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 , - t7.UniversityName as UniversityName, t6.CourseName as CourseName + 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 @@ -102,6 +102,7 @@ class DayBook_model extends CI_Model 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 + left join ".STUDENTS." as t8 on t8.StudentID = t1.StudentID WHERE t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC"; } diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index fd65ba6d..081e54f3 100644 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -204,7 +204,7 @@ $scope.dayBookApprovalAccess = ''; for(var i = datas.length ; i > 0; --i){ var element = datas[i-1]; var value = {}; - value['SNo'] = intDataSNo; + value['SNo'] = element.ORDER_ID; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; var ListName = element.ListName; value['PaidReceivedToFrom'] = element.PaidTo || '-'; diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index afb8fc98..5bca1e9c 100644 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -206,7 +206,7 @@ $scope.dayBookApprovalAccess = ''; for(var i = datas.length ; i > 0; --i){ var element = datas[i-1]; var value = {}; - value['SNo'] = intDataSNo; + value['SNo'] = element.ORDER_ID; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; var ListName = element.ListName; value['PaidReceivedToFrom'] = element.PaidTo || '-'; diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 1c6d4037..f04e7a98 100644 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -299,7 +299,7 @@ $scope.loadStaring = true; for(var i = datas.length ; i > 0; --i){ var element = datas[i-1]; var value = {}; - value['SNo'] = intDataSNo; + value['SNo'] = element.ORDER_ID; value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-'; var ListName = element.ListName; value['PaidReceivedToFrom'] = element.PaidTo || '-'; diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index 708eae30..6c58f8a3 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -138,6 +138,8 @@ + + @@ -189,6 +191,7 @@ + diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index f5cd4e86..e2c71426 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -136,6 +136,7 @@
S.No Date
{{p.ORDER_ID}} {{p.Date}} {{p.ListName}} {{p.VoucherNumber}}
+ @@ -188,6 +189,7 @@ + diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index c65ced2a..52ab3716 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -123,6 +123,8 @@
S.No Date
{{p.ORDER_ID}} {{p.Date}} {{p.ListName}} {{p.VoucherNumber}}
+ + @@ -177,6 +179,7 @@ +
S.No Date
{{p.ORDER_ID}} {{p.Date}} {{p.ListName}} {{p.VoucherNumber}}