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>

6
app/views/reports/card_settle_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>
@@ -53,10 +53,10 @@
<% @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>

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>

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

@@ -29,7 +29,7 @@
<table class="table table-striped">
<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>
<tr>
<th><%= t :sale %></th>

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

@@ -11,7 +11,7 @@
<table class="table table-striped">
<thead>
<tr>
<th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
<th colspan="7"> From Date : <%= @from.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.strftime("%Y-%b-%d") rescue '-' %></th>
</tr>
<tr>
<th><%= t :sale %></th>

4
app/views/reports/credit_payment/index.html.erb
View File

@@ -53,7 +53,7 @@
<% total_credit_payment += credit.credit_payment %>
<tr>
<% if @shift_from.nil? && @shift_to.nil? %>
<td><%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%></td>
<td><%= credit.sale_date.strftime("%e %b %I:%M%p") rescue '-'%></td>
<% else %>
<td><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%></td>
<% end %>
@@ -72,7 +72,7 @@
<td><%= number_format(credit.payment_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<td>
<%if credit.credit_payment_shift_name == '-' %>
<%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%>
<%= credit.sale_date.strftime("%e %b %I:%M%p") rescue '-'%>
<% else %>
<%= credit.credit_payment_shift_name rescue '-' %>
<% end %>

4
app/views/reports/credit_payment/index.xls.erb
View File

@@ -37,7 +37,7 @@
total_credit_payment += credit.credit_payment %>
<tr>
<% if @shift_from.nil? && @shift_to.nil? %>
<td><%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%></td>
<td><%= credit.sale_date.strftime("%e %b %I:%M%p") rescue '-'%></td>
<% else %>
<td><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%></td>
<% end %>
@@ -56,7 +56,7 @@
<td><%= credit.payment_amount rescue '-' %></td>
<td>
<%if credit.credit_payment_shift_name == '-' %>
<%= credit.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%>
<%= credit.sale_date.strftime("%e %b %I:%M%p") rescue '-'%>
<% else %>
<%= credit.credit_payment_shift_name rescue '-' %>
<% end %>

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

@@ -34,7 +34,7 @@
<table class="table table-striped" border="0">
<thead>
<tr>
<th colspan="11"> <%= 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="11"> <%= 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>

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

@@ -12,7 +12,7 @@
<table class="table table-striped" border="0">
<thead>
<tr>
<th colspan="11"> <%= 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="11"> <%= 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>

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

@@ -23,7 +23,7 @@
<table class="table table-bordered">
<thead>
<tr>
<th colspan="<%= column_count = @payment_methods.length + 11 + @tax_profiles.length %>"> <%= 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="<%= column_count = @payment_methods.length + 11 + @tax_profiles.length %>"> <%= 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>
<% @count = @payment_methods.size %>
<tr>

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

@@ -12,7 +12,7 @@
<table class="table table-bordered">
<thead>
<tr>
<th colspan="<%= column_count = @payment_methods.length + 11 + @tax_profiles.length %>"> <%= 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="<%= column_count = @payment_methods.length + 11 + @tax_profiles.length %>"> <%= 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>
<% @count = @payment_methods.size %>
<tr>

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

@@ -19,7 +19,7 @@
<div class="margin-top-20">
<div class="card">
<div colspan="7" class="report-table-header">
<%= 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 '-'%>
<%= 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 '-'%>
</div>
<% if @start_time.blank? || @end_time.blank? %>
<table class="table table-striped" border="0">

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

@@ -10,7 +10,7 @@
<div class="margin-top-20">
<div class="card">
<div colspan="7" class="report-table-header">
<%= 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 '-'%>
<%= 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 '-'%>
</div>
<% if @start_time.blank? || @end_time.blank? %>
<table class="table table-striped" border="0">

6
app/views/reports/induty/index.html.erb
View File

@@ -24,7 +24,7 @@
<table class="table table-striped" id="items_table" border="0">
<thead>
<tr>
<th colspan="7"> <%= 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="7"> <%= 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,8 +52,8 @@
<td><%= induty.receipt_no %></td>
<td><%= induty.name %></td>
<td><%= induty.dining_name %></td>
<td><%= induty.in_time.utc.getlocal.strftime("%d-%m-%Y - %I:%M") %></td>
<td><%= induty.out_time.utc.getlocal.strftime("%d-%m-%Y - %I:%M") %></td>
<td><%= induty.in_time.strftime("%d-%m-%Y - %I:%M") %></td>
<td><%= induty.out_time.strftime("%d-%m-%Y - %I:%M") %></td>
</tr>
<% end %>
<% end %>

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

@@ -13,7 +13,7 @@
<table class="table table-striped" id="items_table" border="0">
<thead>
<tr>
<th colspan="7"> <%= 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="7"> <%= 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>
@@ -39,8 +39,8 @@
<td><%= induty.receipt_no %></td>
<td><%= induty.name %></td>
<td><%= induty.dining_name %></td>
<td><%= induty.in_time.utc.getlocal.strftime("%d-%m-%Y - %I:%M") %></td>
<td><%= induty.out_time.utc.getlocal.strftime("%d-%m-%Y - %I:%M") %></td>
<td><%= induty.in_time.strftime("%d-%m-%Y - %I:%M") %></td>
<td><%= induty.out_time.strftime("%d-%m-%Y - %I:%M") %></td>
</tr>
<% end %>
<% end %>

4
app/views/reports/order_reservation/index.html.erb
View File

@@ -29,7 +29,7 @@
<table class="table table-striped" border="0">
<thead>
<tr>
<th colspan="15"> <%= 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="15"> <%= 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>
@@ -128,7 +128,7 @@
end
%>
<tr>
<td><%= order_reservation.receipt_date.utc.getlocal.strftime("%Y-%m-%d") %></td>
<td><%= order_reservation.receipt_date.strftime("%Y-%m-%d") %></td>
<td><%= order_reservation.receipt_no %></td>
<td><%= order_reservation.transaction_ref %></td>
<td><%= order_reservation.name %></td>

4
app/views/reports/order_reservation/index.xls.erb
View File

@@ -12,7 +12,7 @@
<table class="table table-striped" border="0">
<thead>
<tr>
<th colspan="15"> <%= 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="15"> <%= 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>
@@ -115,7 +115,7 @@
end
%>
<tr>
<td><%= order_reservation.receipt_date.utc.getlocal.strftime("%Y-%m-%d") %></td>
<td><%= order_reservation.receipt_date.strftime("%Y-%m-%d") %></td>
<td><%= order_reservation.receipt_no %></td>
<td><%= order_reservation.transaction_ref %></td>
<td><%= order_reservation.name %></td>

4
app/views/reports/payment_method/index.html.erb
View File

@@ -25,7 +25,7 @@
<tr>
<th colspan="9">
<strong>
<%= 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 '-'%>
<%= 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 '-'%>
</strong>
</th>
</tr>
@@ -97,7 +97,7 @@
end%>
<tr>
<% if @shift_from.nil? && @shift_to.nil? %>
<td><%= payment.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%></td>
<td><%= payment.sale_date.strftime("%e %b %I:%M%p") rescue '-'%></td>
<% else %>
<td><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%></td>
<% end %>

4
app/views/reports/payment_method/index.xls.erb
View File

@@ -12,7 +12,7 @@
<tr>
<th colspan="9">
<strong>
<%= 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 '-'%>
<%= 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 '-'%>
</strong>
</th>
</tr>
@@ -83,7 +83,7 @@
end%>
<tr>
<% if @shift_from.nil? && @shift_to.nil? %>
<td><%= payment.sale_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-'%></td>
<td><%= payment.sale_date.strftime("%e %b %I:%M%p") rescue '-'%></td>
<% else %>
<td><%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%></td>
<% end %>

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

@@ -30,7 +30,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>

2
app/views/reports/receipt_no/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.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>

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

@@ -22,7 +22,7 @@
<table class="table table-striped" border="0">
<thead>
<tr>
<th colspan="7"> <%= 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 colspan="7"> <%= 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 %>

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

@@ -13,7 +13,7 @@
<table class="table table-striped" border="0">
<thead>
<tr>
<th colspan="7"> <%= 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 colspan="7"> <%= 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 %>

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

@@ -25,7 +25,7 @@
<table class="table table-striped" id="items_table" border="0">
<thead>
<tr>
<th colspan="7"> <%= 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="7"> <%= 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>

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

@@ -13,7 +13,7 @@
<table class="table table-striped" id="items_table" border="0">
<thead>
<tr>
<th colspan="7"> <%= 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="7"> <%= 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>

2
app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
View File

@@ -77,7 +77,7 @@
//Reset the form to pervious values
<% if params[:shift_name].to_i > 0%>
shift_id = '<%= params[:shift_name] %>'
local_date = '<%= @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")%> -<%= @shift.shift_closed_at ? @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") : "-" %>'
local_date = '<%= @shift.shift_started_at.strftime("%e %b %I:%M%p")%> -<%= @shift.shift_closed_at ? @shift.shift_closed_at.strftime("%e %b %I:%M%p") : "-" %>'
var shift = $('#shift_name');
str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
shift.append(str);

4
app/views/reports/shiftsale/index.html.erb
View File

@@ -33,8 +33,8 @@
<table class="table table-striped">
<thead>
<tr>
<th colspan="7"> <%= 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 colspan="7"> <%= 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>

4
app/views/reports/shiftsale/index.xls.erb
View File

@@ -17,8 +17,8 @@
<table class="table table-striped">
<thead>
<tr>
<th colspan="7"> <%= 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 colspan="7"> <%= 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>

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

@@ -25,7 +25,7 @@
<table class="table table-striped" id="items_table" border="0">
<thead>
<tr>
<th colspan="7"> <%= 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="7"> <%= 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>

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

@@ -13,7 +13,7 @@
<table class="table table-striped" id="items_table" border="0">
<thead>
<tr>
<th colspan="7"> <%= 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="7"> <%= 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>

4
app/views/reports/stock_check/index.html.erb
View File

@@ -31,7 +31,7 @@
<table class="table table-striped">
<thead>
<tr>
<th colspan="8"><i> From Date </i>: <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <i>To Date</i> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
<th colspan="8"><i> From Date </i>: <%= @from.strftime("%Y-%b-%d") rescue '-' %> - <i>To Date</i> : <%= @to.strftime("%Y-%b-%d") rescue '-' %></th>
</tr>
<tr>
<th><%= t("views.right_panel.detail.item") %> <%= t("views.right_panel.detail.name") %></th>
@@ -76,7 +76,7 @@
<td><%= result.remark rescue '-' %></td>
<td><%= Employee.find(result.stock_check.check_by).name rescue '-' %></td>
<td><%= result.stock_check.reason rescue '-' %></td>
<td><%= result.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
<td><%= result.created_at.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
</tr>
<% !result.stock_count.nil? ? total_stock_count += result.stock_count : total_stock_count += 0 %>
<% !result.stock_balance.nil? ? total_stock_balance += result.stock_balance : total_stock_balance += 0 %>

4
app/views/reports/stock_check/index.xls.erb
View File

@@ -11,7 +11,7 @@
<table class="table table-striped">
<thead>
<tr>
<th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
<th colspan="7"> From Date : <%= @from.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.strftime("%Y-%b-%d") rescue '-' %></th>
</tr>
<tr>
<th><%= t("views.right_panel.detail.item") %> <%= t("views.right_panel.detail.name") %></th>
@@ -56,7 +56,7 @@
<td><%= result.remark rescue '-' %></td>
<td><%= Employee.find(result.stock_check.check_by).name rescue '-' %></td>
<td><%= result.stock_check.reason rescue '-' %></td>
<td><%= result.created_at.utc.getlocal.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
<td><%= result.created_at.strftime("%e %b %Y %I:%M %p") rescue '-' %></td>
</tr>
<% !result.stock_count.nil? ? total_stock_count += result.stock_count : total_stock_count += 0 %>
<% !result.stock_balance.nil? ? total_stock_balance += result.stock_balance : total_stock_balance += 0 %>

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

@@ -60,7 +60,7 @@
<% result[:items].each do |item| %>
<tr>
<td><%= item.receipt_no rescue '-' %> </td>
<td><%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %></td>
<td><%= item.receipt_date.strftime("%e %b %I:%M%p") rescue '-' %></td>
<td><%= number_format(item.total_amount.to_f, precision: precision.to_i ,delimiter: delimiter) %> </td>
<td><%= number_format(item.grand_total.to_f , precision: precision.to_i ,delimiter: delimiter) rescue '-'%> </td>
<td><%= number_format(item.rounding_adjustment.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>

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

@@ -44,7 +44,7 @@
<% result[:items].each do |item| %>
<tr>
<td><%= item.receipt_no rescue '-' %> </td>
<td><%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %></td>
<td><%= item.receipt_date.strftime("%e %b %I:%M%p") rescue '-' %></td>
<td><%= item.total_amount.to_f rescue '-'%> </td>
<td><%= item.grand_total.to_f rescue '-'%> </td>
<td><%= item.rounding_adjustment.to_f rescue '-' %></td>

2
app/views/reports/waste_and_spoilage/index-bk.html.erb
View File

@@ -36,7 +36,7 @@
</td>
<td></td>
<td></td>
<td colspan="3" style="text-align:right"><strong>Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %></strong></td>
<td colspan="3" style="text-align:right"><strong>Date : <%= sale.created_at.strftime("%e,%b %Y %I:%M %p") %></strong></td>
</tr>
<tr>
<td><strong>Menu Category</strong></td>

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

@@ -28,7 +28,7 @@
</td>
<td></td>
<td></td>
<td colspan="3" style="text-align:right"><strong>Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %></strong></td>
<td colspan="3" style="text-align:right"><strong>Date : <%= sale.created_at.strftime("%e,%b %Y %I:%M %p") %></strong></td>
</tr>
<tr>
<td><strong>Menu Category</strong></td>