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

Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
phyusin
2018-07-20 13:44:13 +06:30
parent 88f7d0d2b7 5c75a99e41
commit 6c0af7735d
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/reports/receipt_no_detail/index.html.erb
View File

@@ -127,14 +127,14 @@
<td>&nbsp;</td>
</tr>
<% end %>
<% if result.sale_payments.count > 0%>
<% result.sale_payments.each do |rec| %>
<% sale_payments = SalePayment.get_sale_payments(result) %>
<% if sale_payments.length > 0%>
<% sale_payments.each do |rec| %>
<tr>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>Payment <%= rec.payment_method.upcase %></td>
<td><%= rec.payment_amount %> ( <%= result.payment_status %> )</td>
<td><%= rec.payment_amount %> ( <%= rec.payment_status %> )</td>
<td>&nbsp;</td>
</tr>

5
app/views/reports/receipt_no_detail/index.xls.erb
View File

@@ -119,8 +119,9 @@
</tr>
<% end %>
<% if result.sale_payments.count > 0%>
<% result.sale_payments.each do |rec| %>
<% sale_payments = SalePayment.get_sale_payments(result) %>
<% if sale_payments.length > 0%>
<% sale_payments.each do |rec| %>
<tr>
<td>&nbsp;</td>
<td>&nbsp;</td>