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

Merge branch 'r-1902001-01' into foodcourt

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-07-11 04:00:55 +06:30
parent 4b0d7294ae 13fcb69dee
commit 2ee1fc2423
99 changed files with 2085 additions and 1781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@
<% @payment_methods.each do |method| %>
<tr>
<th></th>
<td style="text-align: right;"><%= method %> Payment</td>
<td style="text-align: right;"><%= method.parameterize == 'paymal' ? 'Card' : method.parameterize %> Payment</td>
<td><%= @other_payment[method.parameterize.to_sym] || 0.0 %></td>
<% total_other_amount = total_other_amount + (@other_payment[method.parameterize.to_sym] || 0.0) %>
</tr>
@@ -154,7 +154,7 @@
<tr>
<th></th>
<th style="text-align: right;">Total Payment </th>
<th><%= total_other_amount + @other_payment.foc_amount + @shift.cash_sales + @shift.credit_sales %></th>
<th><%= total_other_amount + @other_payment.foc_amount.to_d + @shift.cash_sales.to_d + @shift.credit_sales.to_d %></th>
</tr>
</table>
</td>