diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index 62333e7b..01245c10 100644 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -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': '', diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index 99a68da5..9a0ebcfc 100644 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -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 = { diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index 6c58f8a3..e1e09fa6 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -194,7 +194,9 @@