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

Edit

Browse Source
This commit is contained in:
San Wai Lwin
2018-08-06 16:37:52 +06:30
parent 436392550d
commit 35ac07b0a6
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@
<td><%= cardSale.res_amt %></td> <td><%= cardSale.res_amt %></td>
<td> <td>
<% if cardSale.app == 'cup' %> <% if cardSale.app == 'cup' %>
UNION Pay UnionPay
<% else %> <% else %>
<%= cardSale.app %> <%= cardSale.app %>
<% end %> <% end %>

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

@@ -34,7 +34,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>
@@ -49,7 +48,7 @@
<td><%= cardSale.res_amt %></td> <td><%= cardSale.res_amt %></td>
<td> <td>
<% if cardSale.app == 'cup' %> <% if cardSale.app == 'cup' %>
UNION Pay UnionPay
<% else %> <% else %>
<%= cardSale.app %> <%= cardSale.app %>
<% end %> <% end %>

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

@@ -34,7 +34,6 @@
<th><%= t("views.right_panel.detail.sale_amount") %></th> <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_cnt") %></th>
<th><%= t("views.right_panel.detail.void_amount") %></th> <th><%= t("views.right_panel.detail.void_amount") %></th>
<th><%= t("views.right_panel.detail.status") %></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -51,7 +50,6 @@
<td><%= cardSettle.sale_amt %></td> <td><%= cardSettle.sale_amt %></td>
<td><%= cardSettle.void_cnt %></td> <td><%= cardSettle.void_cnt %></td>
<td><%= cardSettle.void_amt %></td> <td><%= cardSettle.void_amt %></td>
<td><%= cardSettle.status %></td>
</tr> </tr>
<% end %> <% end %>
<% else %> <% else %>

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

@@ -99,7 +99,7 @@
<td><%= cardSale.res_amt %></td> <td><%= cardSale.res_amt %></td>
<td> <td>
<% if cardSale.app == 'cup' %> <% if cardSale.app == 'cup' %>
UNION Pay UnionPay
<% else %> <% else %>
<%= cardSale.app %> <%= cardSale.app %>
<% end %> <% end %>