update view

This commit is contained in:
Aung Myo
2017-07-09 11:02:32 +06:30
parent c73cfa4c2d
commit 292c8ff563
2 changed files with 3 additions and 10 deletions

View File

@@ -24,11 +24,9 @@
<div class="table-responsive">
<table class="table table-bordered">
<thead>
<% if params[:from]%>
<tr>
<th colspan="17"> Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>)</th>
<th colspan="17"> Sale (<%= from rescue '-' %> - <%= to rescue '-'%>)</th>
</tr>
<% end %>
<tr>
<th style='text-align:center;'>Sr.no</th>
<th style='text-align:center;'>Date</th>

View File

@@ -61,9 +61,7 @@
<% total_nett = 0 %>
<% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %>
<%
if @sale_data!=nil
@sale_data.each do |result| %>
<% @sale_data.each do |result| %>
<% grand_total = grand_total.to_f + result.grand_total.to_f %>
<% total_tax += result.total_tax.to_f %>
@@ -85,10 +83,7 @@
<td><%= result.grand_total_after_rounding() rescue '-'%></td>
</tr>
<%
end
end
%>
<% end %>
<tr style="border-top:4px double #666;">
<td colspan="2">&nbsp;</td>
<td><b><%= total_sum rescue '-'%></b></td>