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_sale_tran/index.html.erb
View File

@@ -24,7 +24,7 @@
<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.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%></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.strftime("%Y-%b-%d") rescue '-'%></th>
</tr>
<% if @shift_from %>
<tr>
@@ -52,10 +52,10 @@
<% if @cardSales != 0 %>
<% @cardSales.each do |cardSale| %>
<tr>
<td><%= cardSale.req_date %> <%= cardSale.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.req_date %> <%= cardSale.req_time.strftime("%I:%M %p") %></td>
<td><%= cardSale.req_inv_no %></td>
<td><%= cardSale.req_amt %></td>
<td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.res_date %> <%= cardSale.res_time.strftime("%I:%M %p") %></td>
<td><%= cardSale.ref_no %></td>
<td><%= cardSale.res_amt %></td>
<td>

6
app/views/reports/card_sale_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>
@@ -40,10 +40,10 @@
<% if @cardSales != 0 %>
<% @cardSales.each do |cardSale| %>
<tr>
<td><%= cardSale.req_date %> <%= cardSale.req_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.req_date %> <%= cardSale.req_time.strftime("%I:%M %p") %></td>
<td><%= cardSale.req_inv_no %></td>
<td><%= cardSale.req_amt %></td>
<td><%= cardSale.res_date %> <%= cardSale.res_time.utc.getlocal.strftime("%I:%M %p") %></td>
<td><%= cardSale.res_date %> <%= cardSale.res_time.strftime("%I:%M %p") %></td>
<td><%= cardSale.ref_no %></td>
<td><%= cardSale.res_amt %></td>
<td>