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

64
app/views/transactions/card_sale_trans/index.html.erb
View File

@@ -86,42 +86,34 @@
</thead>
<tbody>
<% if @cardSales != 0 %>
<% @cardSales.each do |cardSale| %>
<tr>
<td><%= link_to cardSale.sale_id, transactions_sale_path(cardSale.sale_id) rescue '-' %></td>
<td><%= cardSale.req_date %> <%= cardSale.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.req_inv_no %></td>
<td><%= cardSale.req_amt %></td>
<td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.ref_no %></td>
<td><%= cardSale.res_amt %></td>
<td>
<% if cardSale.app == 'cup' %>
UNION
<% else %>
<%= cardSale.app %>
<% end %>
</td>
<td><%= cardSale.sale.customer.name rescue '-' %></td>
<td><%= cardSale.sale.cashier_name rescue '-' %></td>
<td>TID : <%= cardSale.terminal_id %>
<br>
MID : <%= cardSale.trace %>
<br>
Batch : <%= cardSale.batch_no %>
<br>
Trace : <%= cardSale.merchant_id %>
</td>
<td><%= cardSale.status %></td>
</tr>
<% end %>
<% else %>
<tr><td colspan="10"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr>
<% end %>
</tbody>
</table>
<% if @cardSales != 0 %>
<% @cardSales.each do |cardSale| %>
<tr>
<td><%= cardSale.req_date %> <%= cardSale.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.req_inv_no %></td>
<td><%= cardSale.req_amt %></td>
<td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.ref_no %></td>
<td><%= cardSale.res_amt %></td>
<td><%= cardSale.app %></td>
<td><%= cardSale.sale.customer.name rescue '-' %></td>
<td><%= cardSale.sale.cashier_name rescue '-' %></td>
<td>TID : <%= cardSale.terminal_id %>
<br>
MID : <%= cardSale.trace %>
<br>
Batch : <%= cardSale.batch_no %>
<br>
Trace : <%= cardSale.merchant_id %>
</td>
<td><%= cardSale.status %></td>
</tr>
<% end %>
<% else %>
<tr><td colspan="10"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr>
<% end %>
</tbody>
</table>
<br>
<% if @cardSales != 0 %>
<%= paginate @cardSales %>

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>