git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update view

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/reports/dailysale/index.html.erb
View File

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

9
app/views/reports/receipt_no/index.html.erb
View File

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