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

check menu is_available, survey id and check status with sale items SUM in receipBill

Browse Source
This commit is contained in:
phyusin
2018-05-16 17:08:00 +06:30
parent 486694a5e4
commit fa4c5d075e
8 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,14 +151,24 @@
<td style='text-align:right;'><%= number_with_precision(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
</tr>
<% total_tax = 0 %>
<% total_tax = 0
tax_amount = 0
tax_name = ''
tax_arr = [] %>
<% net = 0 %>
<% unless @tax.empty? %>
<% @tax.each do |tax| %>
<% total_tax += tax.tax_amount.to_f %>
<% if tax.tax_name.downcase == tax_name.downcase
tax_amount += tax.tax_amount
else
tax_amount = tax.tax_amount
end
tax_name = tax.tax_name
total_tax += tax.tax_amount.to_f
%>
<tr style="font-weight:600;">
<td colspan="17" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
<td style='text-align:right;'><%= number_with_precision(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
<td colspan="17" style='text-align:right;'><%= tax_name rescue '-'%></td>
<td style='text-align:right;'><%= number_with_precision(tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
<td colspan="2">&nbsp;</td>
</tr>
<% end %>
@@ -170,8 +180,8 @@
<td colspan="2">&nbsp;</td>
</tr>
<% net = grand_total%>
<% net = grand_total- discount%>
<% net = grand_total %>
<% net = grand_total + discount%>
<% net = net - rounding_adj%>
<% net = net - total_tax %>
<tr style="font-weight:600;">