Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

day book changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-09-18 18:27:23 +05:30
parent fe455c2da0
commit 2b237e1406
7 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/models/DayBook_model.php
View File

@ -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();

11
Apollo/assets/js/controllers/daybookCtrl.js
View File

@ -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) {

8
Apollo/assets/js/controllers/daybookadminCtrl.js
View File

@ -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) {

12
Apollo/assets/js/controllers/daybooksuperadminCtrl.js
View File

@ -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");
}
}

2
Apollo/assets/views/daybook/daybook.html
View File

@ -192,7 +192,7 @@
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}}</td>
<td>{{p.PaidTo}} {{ p.Lastname}}</td>
<td> {{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
<td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>

2
Apollo/assets/views/daybook/daybookadmin.html
View File

@ -191,7 +191,7 @@
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}}</td>
<td>{{p.PaidTo}} {{ p.Lastname}}</td>
<!-- <td> {{p.FeePaymentDetails}}</td>
<td>{{p.CourseName}}</td> -->
<td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>

16
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -150,9 +150,9 @@
<th style="width: 7.5%">
Receipt No
</th>
<th style="width: 7.5%">
<!-- <th style="width: 7.5%">
Comments
</th>
</th> -->
<th style="width: 7.5%">Mode of Payment
</th>
@ -162,6 +162,10 @@
<th style="width: 7%">Balance
</th>
<th style="width: 7.5%">
Comments
</th>
<th style="width: 7%">Reason</th>
<th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
@ -176,18 +180,20 @@
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}}</td>
<td>{{p.PaidTo}} {{ p.Lastname}}</td>
<td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
<td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
<td>{{p.ReceiptNo}}</td>
<td>
<div class="containersPara"><span style="white-space:pre-wrap;">{{p.ReceiptNoComments}}</span></div> </td>
<!-- <td>
<div class="containersPara"><span style="white-space:pre-wrap;">{{p.ReceiptNoComments}}</span></div> </td> -->
<td>{{p.ModeOfPayment}}</td>
<td>{{p.Amount}}</td>
<td>{{p.Balance}}</td>
<td>
<div class="containersPara"><span style="white-space:pre-wrap;">{{p.ReceiptNoComments}}</span></div> </td>
<td>{{p.Reason}}</td>
<!--<td class="center" tooltip="{{p.Approval_Comments}}" ng-if="p.ListName == 'Income'">
- </td>-->