diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 0e6c4d1d..ff9aaa60 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -2298,6 +2298,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout", $scope.BranchLogo = ""; $scope.FeesReceiptTitle = ""; $scope.myPdfView = ''; + $scope.cur_url = ''; $scope.ShowHide = function (pdfValue,print) { $timeout(()=> { //alert(this.print); @@ -2316,6 +2317,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout", $scope.BranchLogo = pdfValue.LogoPath; $scope.FeesReceiptTitle = pdfValue.FeesReceiptTitle; $scope.receiptNo=pdfValue.ReceiptNo; + $scope.cur_url = window.location.hostname + window.location.pathname; @@ -2326,12 +2328,13 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout", var printHtml = document.getElementById(print).outerHTML; //var currentPage = document.body.innerHTML; + var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no'); var elementPage = '' + printHtml + '

' + printHtml + ''; - document.body.innerHTML = elementPage; - window.print(); - document.body.innerHTML = elementPage; - window.location.reload(); - document.close(); + popupWinindow.document.body.innerHTML = elementPage; + popupWinindow.print(); + popupWinindow.document.body.innerHTML = elementPage; + //window.location.reload(); + popupWinindow.document.close(); } // $scope.mouseLeave = function(){ diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index b633f923..63184d54 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -455,14 +455,14 @@
- APP + APP
- APP + APP