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

bill details modal in day book details

Browse Source
This commit is contained in:
gandhimathi 2018-09-20 11:01:24 +05:30
parent 46d098ddea
commit f3314010cb
4 changed files with 104 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -783,7 +783,56 @@ $scope.dayBookApprovalAccess = '';
alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber,concat( PaidTo,Lastname )as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, ReceiptNoComments as Comments, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?',[styleXl(),$scope.data]);
};
//Modal for bill details
$scope.billDetails = function(p){
//$rootScope.student = $scope.selectedStudentsID;
//$rootScope.controller = 'ng-controller="daybooksuperadminCtrl"';
console.log(p);
$scope.bNo=p;
//request to get bill details
var toMerge = {
method: 'POST',
url: apiPoint.url + 'billModal/',
headers: {
'Content-Type': 'application/json'
},
data: {
billNo:$scope.bNo,
}
};
$http(toMerge).then(function (response) {
if (response.data.List == true) {
$rootScope.bill_Details = response.data.bill_Details;
} else {
$scope.message = response.data.message;
}
});
//open bill details in modal
$rootScope.modalInstance = $modal.open({
templateUrl: 'assets/views/Daybook_billDetails_modal.html',
// controller: 'daybooksuperadminCtrl',
// size: size,
});
$rootScope.modalInstance.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
//$log.info('Modal dismissed at: ' + new Date());
});
}
//End of modal for bill details
$scope.searchData = {
'University': '',

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

@ -770,7 +770,56 @@ $scope.dayBookApprovalAccess = '';
alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, concat( PaidTo,Lastname )as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance,ReceiptNoComments as Comments, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?',[styleXl(),$scope.data]);
};
//Modal for bill details
$scope.billDetails = function(p){
//$rootScope.student = $scope.selectedStudentsID;
//$rootScope.controller = 'ng-controller="daybooksuperadminCtrl"';
console.log(p);
$scope.bNo=p;
//request to get bill details
var toMerge = {
method: 'POST',
url: apiPoint.url + 'billModal/',
headers: {
'Content-Type': 'application/json'
},
data: {
billNo:$scope.bNo,
}
};
$http(toMerge).then(function (response) {
if (response.data.List == true) {
$rootScope.bill_Details = response.data.bill_Details;
} else {
$scope.message = response.data.message;
}
});
//open bill details in modal
$rootScope.modalInstance = $modal.open({
templateUrl: 'assets/views/Daybook_billDetails_modal.html',
// controller: 'daybooksuperadminCtrl',
// size: size,
});
$rootScope.modalInstance.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
//$log.info('Modal dismissed at: ' + new Date());
});
}
//End of modal for bill details
$scope.searchData = {

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

@ -194,7 +194,9 @@
<td>{{p.ORDER_ID}}</td>
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td ng-click="billDetails(p.VoucherNumber)">
<span tooltip="Click to view bill details">{{p.VoucherNumber}}</span>
</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.PaidTo}} {{ p.Lastname}}</td>
<td> {{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>

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

@ -192,7 +192,9 @@
<td>{{p.ORDER_ID}}</td>
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td ng-click="billDetails(p.VoucherNumber)">
<span tooltip="Click to view bill details">{{p.VoucherNumber}}</span>
</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.PaidTo}} {{ p.Lastname}}</td>
<!-- <td> {{p.FeePaymentDetails}}</td>
<td>{{p.CourseName}}</td> -->