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

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

Browse Source
This commit is contained in:
phyusin
2018-05-14 15:59:03 +06:30
parent 83a068f1a3 11bae95ac6
commit 5101d7c103
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/transactions/shift_sales/show.html.erb
View File

@@ -150,13 +150,13 @@
<th></th> <th></th>
<td style="text-align: right;">JCB Payment </td> <td style="text-align: right;">JCB Payment </td>
<td><%=other.master_amount.round(2) rescue 0.0 %></td> <td><%=other.master_amount.round(2) rescue 0.0 %></td>
<% @total_amount = @total_amount+other.master_amount rescue 0.0 %> <% @total_amount = @total_amount+other.jcb_amount rescue 0.0 %>
</tr> </tr>
<tr> <tr>
<th></th> <th></th>
<td style="text-align: right;">Master Payment </td> <td style="text-align: right;">Master Payment </td>
<td><%=other.jcb_amount.round(2) rescue 0.0 %></td> <td><%=other.jcb_amount.round(2) rescue 0.0 %></td>
<% @total_amount = @total_amount+other.jcb_amount rescue 0.0 %> <% @total_amount = @total_amount+other.master_amount rescue 0.0 %>
</tr> </tr>
<tr> <tr>
<th></th> <th></th>