From 8f041852c18425a306b143dd75dfd3f5559d35b0 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbinfotech.com>
Date: Sat, 9 Jun 2018 17:05:04 +0530
Subject: [PATCH] banking layout changes

---
 application/views/bankcashnew.php   | 73 ++++++++++++++++++++---------
 application/views/bankdebit.php     | 65 ++++++++++++++++++-------
 application/views/bankinvoice.php   | 56 +++++++++++++++++-----
 application/views/bankstatement.php | 21 ++++++---
 4 files changed, 158 insertions(+), 57 deletions(-)

diff --git a/application/views/bankcashnew.php b/application/views/bankcashnew.php
index 0c7b0dda..b65db618 100644
--- a/application/views/bankcashnew.php
+++ b/application/views/bankcashnew.php
@@ -210,15 +210,17 @@ else
 		//alert(bid+'ighhhhhhhhhhhhh');
 	    var bamd=bankiddebit[1];
 		var alreadypaid=localStorage.getItem('paidedamount');
+		var narration=localStorage.getItem('narr');
 		//alert(alreadypaid+'aap');
 		$('#alreadypaid').val(alreadypaid);
 		var banktotaldebit=localStorage.getItem('debitamount');
 		$('#totalbankamount').val(banktotaldebit);
-		document.getElementById("bankid").innerHTML='Payment ID:'+bid;
-		document.getElementById("bamount").innerHTML='Payment Amount:'+bamd+'Rs';
+		document.getElementById("bankid").innerHTML=bid;
+		document.getElementById("bamount").innerHTML=bamd+'Rs';
 		$('#totalamount').val(bamd);
-		document.getElementById("type").innerHTML='Payment Type:'+type;
-		document.getElementById("bdate").innerHTML='Payment Date:'+cashdate;
+		document.getElementById("type").innerHTML=type;
+		document.getElementById("bdate").innerHTML=cashdate;
+		document.getElementById("narration").innerHTML=narration;
 		
 		 });
 		}
@@ -237,16 +239,18 @@ else
 	   var bidc=bankidcredit[0];
 	   $('#bakid').val(bidc);
 	   var bamc=bankidcredit[1];
+	   var narration=localStorage.getItem('narr');
 	   var totcredit=localStorage.getItem('totcredit');
 	   $('#totalbankamount').val(totcredit);
 	   var alreadyreceived=localStorage.getItem('alreadyreceived');
 	   $('#alreadycreditpaid').val(alreadyreceived);
 	   //for showing text box//
-	   document.getElementById("bankid").innerHTML='Payment ID:'+bidc;
+	   document.getElementById("bankid").innerHTML=bidc;
 	   $('#totalamount').val(bamc);
-	   document.getElementById("bamount").innerHTML='Payment Amount:'+bamc+'Rs';
-	   document.getElementById("type").innerHTML='Payment Type:'+type;
-	   document.getElementById("bdate").innerHTML='Payment Date:'+cashdate;
+	   document.getElementById("bamount").innerHTML=bamc+'Rs';
+	   document.getElementById("type").innerHTML=type;
+	   document.getElementById("bdate").innerHTML=cashdate;
+	   document.getElementById("narration").innerHTML=narration;
 
 	   
 	    });
@@ -282,30 +286,57 @@ else
         <center>Siddharth Industries - Bank Statement(Income and Expenses)</center>
       </h1>
     </section>
+	<br>
                     <!-- form start -->
                     <form role="form" id="addIncomeExpense" action="<?php echo base_url() ?>addIncomeExpense" enctype="multipart/form-data" method="post">
 
                         <div class="box-body">
 						    
-							
+						<table class="table table-bordered table-hover"  style="table-layout:auto;">
+					<thead>
+					  <tr>
+					  
+						<th>Payment ID</th>
+						<th>Payment Mode</th>
+						<th>Payment Type</th>
+						<th>Payment Amount (&#8377;)</th>
+						<th>Payment date </th>
+						<th>Naration </th>
+					   
+					   </tr>
+ 
+					</thead>
+					<tbody>
+					<tr>
+					<td><p style="margin-left:25px;" id="bankid"></p></td>
+					<td>Bank</td>
+					<td><p style="margin-left:25px;" id="type" ></p></td>
+					<td><p style="margin-left:25px;" id="bamount" ></p></td>
+					<td><p style="margin-left:25px;" id="bdate"></p></td>
+					<td><p style="margin-left:25px;" id="narration"></p></td>
+					</tr>
+					</tbody>
+					</table>
+					<br>
+					<br>
 							<br>
                             <div class="row"> 
 							
 							<div class="col-md-12">
 
-							<div class="col-md-3" > 
+							<!-- <div class="col-md-3" > 
 								  <div class="form-group"> 
 										<div style=" border: 2px solid black;margin-left:0%;margin-top: -5px;font-size:14px;background-color:#ccc;">
 									<center><b><p id="bankid">Payment ID:&nbsp;&nbsp;<b></p></b></center>
 									<!-- <p style="margin-left:62px;padding-top:6px;" id="bankid" value="">Payment ID:&nbsp;&nbsp;<b></p> -->
-									<p style="margin-left:41px;">Payment Mode:&nbsp;&nbsp;<b>Bank</b></p>
+									<!-- <p style="margin-left:41px;">Payment Mode:&nbsp;&nbsp;<b>Bank</b></p>
 									<p style="margin-left:41px;" id="bamount" value="">Payment Amount:&nbsp;&nbsp;<b></b></p>
 									<p style="margin-left:41px;" id="type" value="">Payment Amount Type:&nbsp;&nbsp;<b></b></p>
 									<p style="margin-left:41px;" id="bdate" value="">Payment Amount Date:&nbsp;&nbsp;<b></b></p>
                                 </div>	
 
-									</div>
-								</div>		
+									</div> -->
+								<!-- </div>		 -->
 								<div class="col-md-3" > 
 								  <div class="form-group"> 
 								       <b><span for="Accountcode">Select Account type:</span></b>  </br></br>								
@@ -336,19 +367,19 @@ else
                                         <input type="text" class="form-control required" id="Date" readonly  name="Date" ><!--value="<?php echo $cb->cdate?>-->
                                     </div>
 								</div>
-									
+								<div class="col-md-3">                                
+                                    <div class="form-group">
+                                        <b><span for="towhome" id="towhom">AAA</span></b><span style="color:red">*</span></br></br>  
+                                        <input type="text" class="form-control required" id="towhome"   name="towhome">
+                                    </div>
+								</div>
 								
 							        
 							</div>
 
 							<div class="col-md-12">
 
-							<div class="col-md-3">                                
-                                    <div class="form-group">
-                                        <b><span for="towhome" id="towhom">AAA</span></b><span style="color:red">*</span></br></br>  
-                                        <input type="text" class="form-control required" id="towhome"   name="towhome">
-                                    </div>
-								</div>
+							
 									<div class="col-md-3">
 									<div class="form-group">
 									<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>  
@@ -364,7 +395,7 @@ else
 											<input type="text" class="form-control"  id="totalamount" name="totalamount"  onkeypress="return isNumberKey(event)" style="text-align:right;">
 										</div>
 									</div>
-									<div class="col-md-3">
+									<div class="col-md-6">
 											<b><span for="Description">Description:</span></b></br></br>  
 											 
 											<textarea class="form-control"  id="description" name="description" >
diff --git a/application/views/bankdebit.php b/application/views/bankdebit.php
index 9d73653e..747a779a 100644
--- a/application/views/bankdebit.php
+++ b/application/views/bankdebit.php
@@ -42,27 +42,55 @@ foreach($financialyear as $item)
 				 <form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>"> 
 		     	 <center><h3 class="box-title"><p style="color:#3c8dbc"><b>View Purchase </b></p></h3></center>
 			 	 <div class="box-body">
+				  <table class="table table-bordered table-hover"  style="table-layout:auto;">
+                   <thead>
+                     <tr>
+					 
+				       <th>Payment ID</th>
+					   <th>Payment Mode</th>
+					   <th>Payment Amount (&#8377;)</th>
+					   <th>Payment date </th>
+					   <th>Narration </th>
+					  
+                      </tr>
+
+                   </thead>
+				   <tbody>
+				   <tr>
+				   <td><p style="margin-left:25px;" id="bid"></p></td>
+				   <td>Bank</td>
+				   <td><p style="margin-left:25px;" id="bamount" ></p></td>
+				   <td><p style="margin-left:25px;" id="bdate"></p></td>
+				   <td><p style="margin-left:25px;" id="narration"></p></td>
+				   </tr>
+				   </tbody>
+				   </table>
+				   <br>
+				   <br>
+
+
+
                
-			  	 <div class="col-md-12">
-						<div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">
+			  	 <div class="row">
+						 <!-- <div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">
 
 
 						<input type="hidden" id="debitamount" placeholder="Debit Amount"  readonly>
                                 
-                        <input type="hidden" id="bankid" value="" placeholder="Bank Id" readonly>
-                                
-                            
+                        <input type="hidden" id="bankid" value="" placeholder="Bank Id" readonly> -->
+                                 
+                             
                                                        
                             <!-- <div style=" ;margin-left:0%;margin-top: -55px;"> -->
-									<p style="margin-left:25px;" id="bid" value="">Payment ID:&nbsp;&nbsp;</p>
+									<!-- <p style="margin-left:25px;" id="bid" value="">Payment ID:&nbsp;&nbsp;</p> -->
 									<!--<p style="margin-left:25px;" id="debit1amount" value="">Total Amount:&nbsp;&nbsp; </p>-->
-									<p style="margin-left:25px;">Payment Mode:&nbsp;&nbsp;Bank</p>
-									<p style="margin-left:25px;" id="bamount" value="">Payment Amount:&nbsp;&nbsp; </p>	
-									<p style="margin-left:25px;" id="bdate" value="">Payment Amount Date:&nbsp;&nbsp;</p>
+									<!-- <p style="margin-left:25px;">Payment Mode:&nbsp;&nbsp;Bank</p>
+									<p style="margin-left:25px;" id="bamount" </p>	
+									<p style="margin-left:25px;" id="bdate" value="">Payment Amount Date:&nbsp;&nbsp;</p> -->
 	
                             	
 						<!-- </div>	 -->
-						</div>
+						<!-- </div> -->
 			        
 					<div class="col-md-3">
 						    <label for="from_date"> 
@@ -102,14 +130,14 @@ foreach($financialyear as $item)
 					  
 					        </select>
 					</div>
-				</div>	
-					<div class="col-md-1 col-md-offset-10" style="margin-top:20px;">
+					<div class="col-md-3" style="margin-top:20px;">
+					<!-- <div class="col-md-1 col-md-offset-10" style="margin-top:20px;"> -->
                         <input type="submit" class="btn btn-success" name="btn_submit" value="View Purchase">    
 					</div> 
+					</div>
 							
 				
-				 <br>
-				 <br>
+				
 				 <br>
 				 <br>
 					
@@ -227,9 +255,12 @@ foreach($financialyear as $item)
 		var amount=localStorage.getItem('test');
 		var debamount=localStorage.getItem('damount');
 		var cashdate=localStorage.getItem('cddate');
+		var narration= localStorage.getItem('narr');
 		$('#debitamount').val(localStorage.getItem('test'));
-		document.getElementById("bamount").innerHTML='Payment Amount:'+amount;
-		document.getElementById("bdate").innerHTML='Payment date:'+cashdate;
+
+		document.getElementById("bamount").innerHTML=amount;
+		document.getElementById("bdate").innerHTML=cashdate;
+		document.getElementById("narration").innerHTML=narration;
 
 		// alert(document.getElementById("bdate").innerHTML='Payment date:'+cashdate);
 		var res1 = res.split(',');
@@ -241,7 +272,7 @@ foreach($financialyear as $item)
 			var bam=res2[1];
 	  
 	  		$('#bankid').val(bid);
-	  		document.getElementById("bid").innerHTML='Payment ID:' +bid;
+	  		document.getElementById("bid").innerHTML=bid;
          });/** foreach closed */
 		 $.fn.dataTable.moment( 'DD-MM-YYYY' );
     	table = $('#req').DataTable( {
diff --git a/application/views/bankinvoice.php b/application/views/bankinvoice.php
index a06df88f..40abe524 100644
--- a/application/views/bankinvoice.php
+++ b/application/views/bankinvoice.php
@@ -41,30 +41,57 @@ foreach($financialyear as $item)
 			  <div class="col-md-1 col-md-offset-11">
     <a href="<?php base_url() ?>Bankingstatement" class="btn btn-primary" value="Back"/>Back</a>
 	</div>
-			<div class="box-body">           	
+			<div class="box-body"> 
+				
+			
+		
 			<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>"> 
 			 	
 		     <center><h3 class="box-title"><p style="color:#3c8dbc"><b>View Invoice</b></p></h3></center>
 
-			    
+			 <table class="table table-bordered table-hover"  style="table-layout:auto;">
+					<thead>
+					  <tr>
+					  
+						<th>Payment ID</th>
+						<th>Payment Mode</th>
+						<th>Payment Amount (&#8377;)</th>
+						<th>Payment date </th>
+						<th>Naration </th>
+					   
+					   </tr>
+ 
+					</thead>
+					<tbody>
+					<tr>
+					<td><p style="margin-left:25px;" id="bid"></p></td>
+					<td>Bank</td>
+					<td><p style="margin-left:25px;" id="bamount" ></p></td>
+					<td><p style="margin-left:25px;" id="bdate"></p></td>
+					<td><p style="margin-left:25px;" id="narration"></p></td>
+					</tr>
+					</tbody>
+					</table>
+					<br>
+					<br>
 
-						<div class="col-md-12">
-								<div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">  
+						<div class="row">
+								<!-- <div class="col-md-3" style=" border: 2px solid black;font-size:14px;background-color:#ccc;">  
 				          
                                 <input type="hidden" id="debitamount" value="<?php echo $cash; ?>" placeholder="Debit Amount" readonly>            
                            
-                                <input type="hidden" id="bankid" value="<?php echo $bankid; ?>" placeholder="Bank Id" readonly>
+                                <input type="hidden" id="bankid" value="<?php echo $bankid; ?>" placeholder="Bank Id" readonly> -->
                                 
                           
 							                              
                                     <!-- <div style=" border: 2px solid black;margin-left:0%;margin-top: -55px;font-size:14px;background-color:#ccc;"> -->
-										<p style="margin-left:25px;" id="bid" value=""</b>>Payment ID:&nbsp;&nbsp;  </p>
+										<!-- <p style="margin-left:25px;" id="bid" value=""</b>>Payment ID:&nbsp;&nbsp;  </p>
 										<p style="margin-left:25px;">Payment Mode:&nbsp;&nbsp;Bank</p>
 										<p style="margin-left:25px;" id="bamount" value="">Payment Amount:&nbsp;&nbsp; </p>	
 										<p style="margin-left:25px;" id="bdate" value="">Payment Amount Date:&nbsp;&nbsp;</p>
-		
+		 -->
                                     <!-- </div>	 -->
-                                </div>
+                                <!-- </div> -->
 				
 			        <div class="col-md-3">
 						    <label for="from_date"> <?php echo 'From Date'; ?></label>
@@ -104,15 +131,16 @@ foreach($financialyear as $item)
 					  
 					        </select>
 					</div>
-				</div>
+				
 						
-				<div class="col-md-1 col-md-offset-10" style="margin-top:24px;">
+					<div class="col-md-3"style="margin-top:20px;" >
                         <input type="submit" class="btn btn-success" name="btn_submit"
                                value="View Invoice">
                         
 				 
 							
 				</div><!--/ inside 1st .row closed -->
+			</div>
 					<br>
 					<br>
 					<br>
@@ -238,8 +266,10 @@ foreach($financialyear as $item)
 		$('#debitamount').val(localStorage.getItem('tes'));
 		var amount=localStorage.getItem('tes');
 		var cashdate=localStorage.getItem('ccdate');
-		document.getElementById("bamount").innerHTML='Payment Amount:'+amount+'Rs';
-		document.getElementById("bdate").innerHTML='Payment Date:'+cashdate;
+		var narration=localStorage.getItem('narr')
+		document.getElementById("bamount").innerHTML=amount+'Rs';
+		document.getElementById("bdate").innerHTML=cashdate;
+		document.getElementById("narration").innerHTML=narration;
 		var res1 = res.split(',');
 		var i;
 		$.each(res1, function(index, value) 
@@ -250,7 +280,7 @@ foreach($financialyear as $item)
 	  		
 	  		$('#bankid').val(bid);
 	  		
-			  document.getElementById("bid").innerHTML='Payment ID:' +bid;
+			  document.getElementById("bid").innerHTML=bid;
          });/** foreach closed */
 		$.fn.datatable.moment('DD-MM-YYYY');
     	table = $('#req').DataTable( {
diff --git a/application/views/bankstatement.php b/application/views/bankstatement.php
index da7f507c..07e7ecfd 100644
--- a/application/views/bankstatement.php
+++ b/application/views/bankstatement.php
@@ -64,7 +64,7 @@ $finyear  = $item->financial_year;
 							  <div class="modal-content">
 								<div class="modal-header">
 								  <!-- <button type="button" class="close" data-dismiss="modal">&times;</button> -->
-								  
+								  <h4 class="modal-title">Select Options</h4>
 								</div>
 								<div class="modal-body">
 										<div class="row">
@@ -113,10 +113,10 @@ $finyear  = $item->financial_year;
 			  
 				<!-- Modal content-->
 				<div class="modal-content">
-				  <div class="modal-header">
-					<!-- <button type="button" class="close" data-dismiss="modal">&times;</button> -->
-					
-				  </div>
+				<div class="modal-header">
+          <!-- <button type="button" class="close" data-dismiss="modal">&times;</button> -->
+          <h4 class="modal-title">Select Options</h4>
+        </div>
 				  <div class="modal-body">
 						  <div class="row">
 								  <div class="col-md-12">
@@ -312,7 +312,7 @@ $finyear  = $item->financial_year;
 						<td align="left"><span><?php echo  $t->valuedate?></span></td>
 						<td align="left"><span><?php echo  $t->Bankname?></span></td>
 						<td align="left"><span><?php echo  $t->chequeNo?></span></td>
-						<td align="left"><span><?php echo  $t->Narration?></a></span></td>
+						<td align="left" id="narration<?php echo $i ?>"><span><?php echo  $t->Narration?></a></span></td>
 						<td align="left"><span><?php echo  $t->Cod?></span></td>
 						<td align="left" id="debit<?php echo $i ?>"><span><?php echo $t->Debit;?></span></td>
 			
@@ -642,13 +642,19 @@ if (x==true)
 	
 	
   var value=	document.querySelector('input[name="selectedId"]:checked').value;
+  
 
       var id=$('#bankid'+i).text();
 	  var date=$('#date'+i).text();
       var debit=$('#debit'+i).text();
 	  var alreadypaid=$('#totalpaid'+i).text();
 	  var credit=$('#credit1'+i).text();
+	 
 	  localStorage.setItem('totcredit', credit);
+	  var narration=$('#narration'+i).text();
+	 
+	  localStorage.setItem('narr',narration);
+
 	  var alreadycredit=$('#credit2'+i).text();
 	  localStorage.setItem('alreadyreceived',alreadycredit);
 	  localStorage.setItem('paidedamount',alreadypaid);
@@ -672,6 +678,7 @@ if (x==true)
                 localStorage.setItem('test', avalue);
 				localStorage.setItem('debitamount',debit);
 				localStorage.setItem('cddate',date);
+				localStorage.setItem('narration', narration)
 
 				
 				window.location.href="Debitstatement";
@@ -692,6 +699,7 @@ if (x==true)
 				localStorage.setItem('test2',tempcredit);
                 localStorage.setItem('tes', avalue);
 				localStorage.setItem('ccdate',date);
+				localStorage.setItem('narration', narration)
 
 				
 				window.location.href="Invoice";
@@ -715,6 +723,7 @@ if (x==true)
 				localStorage.setItem('debitamount',debit);
 				localStorage.setItem('bankidcredit',tempcredit);
 				localStorage.setItem('cbdate',date);
+				localStorage.setItem('narration', narration)
 
 			
 				window.location.href="Bankcash";