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

Edit in report

Browse Source
This commit is contained in:
San Wai Lwin
2018-08-06 14:44:26 +06:30
parent 10d93a658c
commit 7b74de9b3a
12 changed files with 66 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/transactions/card_settle_trans/index.html.erb
View File

@@ -90,21 +90,9 @@
<tr>
<td><%= cardSettle.shift_sale.shift_started_at.strftime("%e %b %I:%M%p") rescue '-' %> - <%= cardSettle.shift_sale.shift_closed_at ? cardSettle.shift_sale.shift_closed_at.strftime("%e %b %I:%M%p") : '-' %></td>
<td><%= cardSettle.req_date %> <%= cardSettle.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td>
<% if cardSettle.req_type == 'CUP' %>
UNION
<% else %>
<%= cardSettle.req_type %>
<% end %>
</td>
<td><%= cardSettle.req_type %></td>
<td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td>
<% if cardSettle.res_type == 'CUP' %>
UNION
<% else %>
<%= cardSettle.res_type %>
<% end %>
</td>
<td><%= cardSettle.res_type %></td>
<td><%= cardSettle.shift_sale.employee.name %></td>
<td><%= cardSettle.sale_cnt %></td>
<td><%= cardSettle.sale_amt %></td>