update report detail ,close_cashire_pdf and view reports

app/views/reports/receipt_no/index.html.erb

@@ -24,11 +24,9 @@
 		<table class="table table-striped" border="0">
 			<thead>
 				
-					<% if !params[:from].blank?%>
 					<tr>
-						<th colspan="7">From Date : <%= params[:from] %>	,	To Date : <%= params[:to] %></th>
-					</tr>
-					<% end %>
+				        <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+				   </tr>
 					<% if @shift_from %>
 					<tr>
 						<% if @shift_data.employee %>		
@@ -43,7 +41,9 @@
 					<th>Cashier Name</th>		
 					<th>Total Amount</th>
 					<th>Discount Amount </th>
-					<th>Tax Amount</th>	
+					<% @sale_taxes.each do |tax| %>
+					<th><%= tax.tax_name %></th>		
+					<% end %>
 					<!-- <th>Other Amount</th> -->
 					<th>Grand Total</th>
 					<th>Rounding Adj.</th>
@@ -78,8 +78,9 @@
 						<td><%= result.cashier_name rescue '-' %></td>
 						<td><%= result.total_amount rescue '-' %></td>
 						<td><%= result.total_discount rescue '-' %></td>
-						<td><%= result.total_tax rescue '-' %></td>
-						
+						<% result.sale_taxes.each do |tax| %>
+							<td><%= tax.tax_payable_amount rescue '-' %></td>
+						<%end%>
 						
 						<td><%= result.old_grand_total %></td>			
 						<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
@@ -91,9 +92,9 @@
 						<td colspan="2">&nbsp;</td>
 						<td><b><%= total_sum  rescue '-'%></b></td>
 						<td><b><%= discount_amt  rescue '-'%></b></td>
-						<td><b><%= sprintf "%.2f",total_tax  rescue '-'%></b></td><!-- 
-						<td><b><%= sprintf "%.2f",service_charge  rescue '-'%></b></td>	 -->		
-						<!-- <td><b><%= other_amt  rescue '-'%></b></td> -->
+						<% @sale_taxes.each do |tax| %>
+							<td><b><%= tax.st_amount.round(2) %></b></td>
+						<% end %>
 						<td><b><%= old_grand_total.to_f.round(2)  rescue '-'%></b></td>		
 						<td><b><%= rounding_adj  rescue '-'%></b></td>		
 						<td><b><%= old_grand_total.to_f.round + rounding_adj %></b></td>				
@@ -102,7 +103,9 @@
 						<td colspan="2">&nbsp;</td>
 						<td>Total Amount</td>
 						<td>Discount Amount</td>
-						<td>Tax Amount</td>
+						<% @sale_taxes.each do |tax| %>
+							<td><%= tax.tax_name %></td>
+						<% end %>
 						<td>Grand Total</td>
 						<td>Rounding Adj.</td>
 						<td>Grand Total +<br/>