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

Edit Report

Browse Source
This commit is contained in:
San Wai Lwin
2018-08-06 15:14:28 +06:30
parent 7b74de9b3a
commit 0f14a02f2d
3 changed files with 69 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/views/reports/card_sale_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" style="width:112%;">
<table class="table table-striped" border="0">
<thead>
@@ -46,7 +46,6 @@
<th><%= t("views.right_panel.detail.Customer_name") %></th>
<th><%= t("views.right_panel.detail.Cashier_name") %></th>
<th><%= t("views.right_panel.detail.detail") %></th>
<th><%= t("views.right_panel.detail.status") %></th>
</tr>
</thead>
<tbody>
@@ -59,18 +58,32 @@
<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>
<% 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>
<td>
<% if cardSale.terminal_id != '' %>
TID : <%= cardSale.terminal_id %>
<br>
<% end %>
<% if cardSale.merchant_id != '' %>
MID : <%= cardSale.merchant_id %>
<br>
<% end %>
<% if cardSale.batch_no != '' %>
Batch : <%= cardSale.batch_no %>
<br>
<% end %>
<% if cardSale.trace != '' %>
Trace : <%= cardSale.trace %>
<% end %>
</td>
</tr>
<% end %>
<% else %>