diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index fee0ab28..8c541fa7 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -66,7 +66,7 @@ class DayBook_model extends CI_Model $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,t8.Lastname 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 @@ -74,6 +74,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 date_format(t1.CreatedOn,'%Y-%m-%d') BETWEEN '$fromDate' AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC"; // echo $querys;exit(); diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index 267f297f..89a52beb 100644 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -519,7 +519,10 @@ $scope.dayBookApprovalAccess = ''; } //delete the income entry From the fees payable $scope.deleteFeePayableEntry = function (reason, id) { - // alert(id); + // alert(id); + + if(reason !='') + { SweetAlert.swal({ title: "Warning!", text: "Do you want to Delete this Entry ?", @@ -564,6 +567,12 @@ $scope.dayBookApprovalAccess = ''; } } }); + } + + else + { + swal(" ","Reason is Mandatorary","error"); + } } $scope.deleted = function (id) { diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index cad3506e..f7f6cc6b 100644 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -511,6 +511,9 @@ $scope.dayBookApprovalAccess = ''; //delete the income entry From the fees payable $scope.deleteFeePayableEntry = function (reason,id) { + + if(reason !='') + { SweetAlert.swal({ title: "Warning!", text: "Do you want to Delete this Entry ?", @@ -555,6 +558,11 @@ $scope.dayBookApprovalAccess = ''; } } }); + } + else + { + swal(" ","Reason is Mandatorary","error"); + } } $scope.deleted = function (id) { diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 83482c96..ac4d0278 100644 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -640,7 +640,8 @@ $scope.loadStaring = true; } //delete the income entry From the fees payable $scope.deleteFeePayableEntry = function (reason, id) { - // alert(id); + // alert(id); + if(reason != ''){ SweetAlert.swal({ title: "Warning!", text: "Do you want to Delete this Entry ?", @@ -659,7 +660,11 @@ $scope.loadStaring = true; if(reason == '') { - alert('Please Enter Reason for Deletion'); + + + //reason = prompt("Reason For Deletion!", ""); + + //$scope.deleteFeePayableEntry(reason, $scope.ID); // swal("Please Enter Reason!", "", "error"); @@ -693,6 +698,9 @@ $scope.loadStaring = true; } } }); + }else{ + swal(" ","Reason is Mandatorary","error"); + } } diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index 62d27caf..de5c16b0 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -192,7 +192,7 @@ {{p.Date}} {{p.ListName}} {{p.VoucherNumber}} - {{p.PaidTo}} + {{p.PaidTo}} {{ p.Lastname}} {{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}} {{p.TypeName}} diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 48e38bb6..572f4c94 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -191,7 +191,7 @@ {{p.Date}} {{p.ListName}} {{p.VoucherNumber}} - {{p.PaidTo}} + {{p.PaidTo}} {{ p.Lastname}} {{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}} diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 049d763e..39d27c7d 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -150,9 +150,9 @@ Receipt No - + Mode of Payment @@ -162,6 +162,10 @@ Balance + + + Comments + Reason Status @@ -176,18 +180,20 @@ {{p.Date}} {{p.ListName}} {{p.VoucherNumber}} - {{p.PaidTo}} + {{p.PaidTo}} {{ p.Lastname}} {{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}} {{p.TypeName}} {{p.TypeName}} {{p.ReceiptNo}} - -
{{p.ReceiptNoComments}}
+ {{p.ModeOfPayment}} {{p.Amount}} {{p.Balance}} + +
{{p.ReceiptNoComments}}
{{p.Reason}}