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

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

@@ -59,13 +59,7 @@
<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.app %></td>
<td><%= cardSale.sale.customer.name rescue '-' %></td>
<td><%= cardSale.sale.cashier_name rescue '-' %></td>
<td>TID : <%= cardSale.terminal_id %>

8
app/views/reports/card_sale_tran/index.xls.erb
View File

@@ -47,13 +47,7 @@
<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.app %></td>
<td><%= cardSale.sale.customer.name rescue '-' %></td>
<td><%= cardSale.sale.cashier_name rescue '-' %></td>
<td>TID : <%= cardSale.terminal_id %>

19
app/views/reports/card_settle_tran/index.html.erb
View File

@@ -19,7 +19,7 @@
</div>
<div class="margin-top-20">
<div class="card" style="width:115%;">
<div class="card">
<table class="table table-striped" border="0">
<thead>
@@ -46,7 +46,6 @@
<th><%= t("views.right_panel.detail.sale_amount") %></th>
<th><%= t("views.right_panel.detail.void_cnt") %></th>
<th><%= t("views.right_panel.detail.void_amount") %></th>
<th><%= t("views.right_panel.detail.status") %></th>
</tr>
</thead>
<tbody>
@@ -55,27 +54,15 @@
<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><%= 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>
<td><%= cardSettle.void_cnt %></td>
<td><%= cardSettle.void_amt %></td>
<td><%= cardSettle.status %></td>
</tr>
<% end %>
<% else %>

52
app/views/reports/card_settle_tran/index.xls.erb
View File

@@ -37,38 +37,26 @@
<th><%= t("views.right_panel.detail.status") %></th>
</tr>
</thead>
<tbody>
<% if @cardSettles != 0 %>
<% @cardSettles.each do |cardSettle| %>
<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.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.shift_sale.employee.name %></td>
<td><%= cardSettle.sale_cnt %></td>
<td><%= cardSettle.sale_amt %></td>
<td><%= cardSettle.void_cnt %></td>
<td><%= cardSettle.void_amt %></td>
<td><%= cardSettle.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>
<% if @cardSettles != 0 %>
<% @cardSettles.each do |cardSettle| %>
<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><%= cardSettle.req_type %></td>
<td><%= cardSettle.res_date %> <%= cardSettle.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSettle.res_type %></td>
<td><%= cardSettle.shift_sale.employee.name %></td>
<td><%= cardSettle.sale_cnt %></td>
<td><%= cardSettle.sale_amt %></td>
<td><%= cardSettle.void_cnt %></td>
<td><%= cardSettle.void_amt %></td>
<td><%= cardSettle.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>
</div>