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>
<div class="margin-top-20"> <div class="margin-top-20">
<div class="card" style="width:115%;"> <div class="card" style="width:112%;">
<table class="table table-striped" border="0"> <table class="table table-striped" border="0">
<thead> <thead>
@@ -46,7 +46,6 @@
<th><%= t("views.right_panel.detail.Customer_name") %></th> <th><%= t("views.right_panel.detail.Customer_name") %></th>
<th><%= t("views.right_panel.detail.Cashier_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.detail") %></th>
<th><%= t("views.right_panel.detail.status") %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -59,18 +58,32 @@
<td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.ref_no %></td> <td><%= cardSale.ref_no %></td>
<td><%= cardSale.res_amt %></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.customer.name rescue '-' %></td>
<td><%= cardSale.sale.cashier_name rescue '-' %></td> <td><%= cardSale.sale.cashier_name rescue '-' %></td>
<td>TID : <%= cardSale.terminal_id %> <td>
<br> <% if cardSale.terminal_id != '' %>
MID : <%= cardSale.trace %> TID : <%= cardSale.terminal_id %>
<br> <br>
Batch : <%= cardSale.batch_no %> <% end %>
<br> <% if cardSale.merchant_id != '' %>
Trace : <%= cardSale.merchant_id %> MID : <%= cardSale.merchant_id %>
</td> <br>
<td><%= cardSale.status %></td> <% end %>
<% if cardSale.batch_no != '' %>
Batch : <%= cardSale.batch_no %>
<br>
<% end %>
<% if cardSale.trace != '' %>
Trace : <%= cardSale.trace %>
<% end %>
</td>
</tr> </tr>
<% end %> <% end %>
<% else %> <% else %>

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

@@ -47,25 +47,39 @@
<td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td> <td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.ref_no %></td> <td><%= cardSale.ref_no %></td>
<td><%= cardSale.res_amt %></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.customer.name rescue '-' %></td>
<td><%= cardSale.sale.cashier_name rescue '-' %></td> <td><%= cardSale.sale.cashier_name rescue '-' %></td>
<td>TID : <%= cardSale.terminal_id %> <td>
<br> <% if cardSale.terminal_id != '' %>
MID : <%= cardSale.trace %> TID : <%= cardSale.terminal_id %>
<br> <br>
Batch : <%= cardSale.batch_no %> <% end %>
<br> <% if cardSale.merchant_id != '' %>
Trace : <%= cardSale.merchant_id %> MID : <%= cardSale.merchant_id %>
</td> <br>
<td><%= cardSale.status %></td> <% end %>
<% if cardSale.batch_no != '' %>
Batch : <%= cardSale.batch_no %>
<br>
<% end %>
<% if cardSale.trace != '' %>
Trace : <%= cardSale.trace %>
<% end %>
</td>
</tr> </tr>
<% end %> <% end %>
<% else %> <% else %>
<tr><td colspan="10"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr> <tr><td colspan="10"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr>
<% end %> <% end %>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div> </div>

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

@@ -89,6 +89,8 @@
<% if @cardSales != 0 %> <% if @cardSales != 0 %>
<% @cardSales.each do |cardSale| %> <% @cardSales.each do |cardSale| %>
<tr> <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_date %> <%= cardSale.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.req_inv_no %></td> <td><%= cardSale.req_inv_no %></td>
<td><%= cardSale.req_amt %></td> <td><%= cardSale.req_amt %></td>
@@ -98,14 +100,23 @@
<td><%= cardSale.app %></td> <td><%= cardSale.app %></td>
<td><%= cardSale.sale.customer.name rescue '-' %></td> <td><%= cardSale.sale.customer.name rescue '-' %></td>
<td><%= cardSale.sale.cashier_name rescue '-' %></td> <td><%= cardSale.sale.cashier_name rescue '-' %></td>
<td>TID : <%= cardSale.terminal_id %> <td>
<br> <% if cardSale.terminal_id != '' %>
MID : <%= cardSale.trace %> TID : <%= cardSale.terminal_id %>
<br> <br>
Batch : <%= cardSale.batch_no %> <% end %>
<br> <% if cardSale.merchant_id != '' %>
Trace : <%= cardSale.merchant_id %> MID : <%= cardSale.merchant_id %>
</td> <br>
<% end %>
<% if cardSale.batch_no != '' %>
Batch : <%= cardSale.batch_no %>
<br>
<% end %>
<% if cardSale.trace != '' %>
Trace : <%= cardSale.trace %>
<% end %>
</td>
<td><%= cardSale.status %></td> <td><%= cardSale.status %></td>
</tr> </tr>
<% end %> <% end %>