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

remove unnessary timezone convertion

Browse Source
This commit is contained in:
Thein Lin Kyaw
2022-04-19 19:40:53 +06:30
parent 3c7fd0aff4
commit 3c5416a154
154 changed files with 321 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
<table class="table table-striped" border="0">
<thead>
<tr>
<th colspan="9"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to ? @to.utc.getlocal.strftime("%Y-%b-%d") : '-'%></th>
<th colspan="9"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to ? @to.strftime("%Y-%b-%d") : '-'%></th>
</tr>
<% if @shift_from %>
<tr>
@@ -41,9 +41,9 @@
<% @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_date %> <%= cardSettle.req_time.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_date %> <%= cardSettle.res_time.strftime("%I:%M %p") %></td>
<td><%= cardSettle.res_type %></td>
<td><%= cardSettle.shift_sale.employee.name %></td>
<td><%= cardSettle.sale_cnt %></td>