From ac763058903ee121ba33c86558ebe91db00b61f1 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 31 Aug 2018 15:13:38 +0530
Subject: [PATCH 1/2] Print option changed in bill details screen

---
 Apollo/assets/js/controllers/feesStatusCtrl.js          | 2 ++
 Apollo/assets/views/status-update/updateFeesStatus.html | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index 0e6c4d1d..9519f514 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;
 		
 		
 		
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 @@
                                                     <tr class="title-row" style="height: 15px;">
                                                         <td class="title-branch" ng-if="BranchLogo=='' || BranchLogo==null" style="width: 136px; height: 82px; color: white;  font-size: 22px; text-align: center;" rowspan="3">
 														<div class="user-image">
-                                                                <img class="pull-center" ng-src="assets/images/logo1.png" alt="APP">
+                                                                <img class="pull-center" ng-src="http://{{cur_url}}assets/images/logo1.png" alt="APP">
                                                                <!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage">
                                                                 <img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">-->
                                                             </div>
 														</td>
                                                         <td class="title-branch" ng-if="BranchLogo!='' && BranchLogo!=null" style="width: 136px; height: 82px;  color: white; font-size: 22px; text-align: center;" rowspan="3">
                                                             <div class="user-image">
-                                                                <img class="pull-center" ng-src="images/{{BranchLogo}}" alt="APP">
+                                                                <img class="pull-center" ng-src="http://{{cur_url}}images/{{BranchLogo}}" alt="APP">
                                                                <!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage">
                                                                 <img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">-->
                                                             </div>

From d35263fbf3d55e9aac245b3a0dab5effad877d3b Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 31 Aug 2018 10:13:32 +0000
Subject: [PATCH 2/2] feesStatusCtrl.js edited online with Bitbucket

---
 Apollo/assets/js/controllers/feesStatusCtrl.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index 9519f514..ff9aaa60 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -2328,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 = '<html><head><style type="text/css" media="print">@media print {#Header, #Footer { display:none !important; }}</style></head><body>' + printHtml + '<br><br>' + printHtml + '</body>';
-		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(){