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

change some report format

Browse Source
This commit is contained in:
phyusin
2018-06-28 11:45:07 +06:30
parent 7d5d88a490
commit f6e0e14383
6 changed files with 240 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/transactions/order_reservations/index.html.erb
View File

@@ -70,8 +70,10 @@
<tr>
<th><%= t("views.right_panel.detail.order_reservation_id") %></th>
<th><%= t("views.right_panel.detail.sale_id") %></th>
<th><%= t("views.right_panel.detail.type") %></th>
<th><%= t("views.right_panel.detail.requested_time") %></th>
<th><%= t("views.right_panel.detail.provider") %></th>
<th><%= t("views.right_panel.detail.status") %></th>
<th><%= t :payment_method %></th>
<th><%= t :payment %> <%= t("views.right_panel.detail.status")%></th>
@@ -137,10 +139,11 @@
<tr>
<td>
<%= link_to order_reservation.order_reservation_id, transactions_order_reservation_path(order_reservation) %>
<td><%= link_to order_reservation.sale_id, transactions_sale_path(order_reservation.sale_id) rescue '-' %></td>
<td><%= order_reservation.order_reservation_type %></td>
<td><%= order_reservation.requested_time.utc.getlocal.strftime("%Y-%m-%d %I:%M %p") %></td>
<td><%= order_reservation.status %></td>
<td><%= provider%></td>
<td><%= order_reservation.status %></td>
<td><%= order_reservation.payment_type%></td>
<td><%= order_reservation.payment_status%></td>
<td><%= number_with_precision(order_reservation.total_amount, precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>