remove unnessary timezone convertion
This commit is contained in:
@@ -72,12 +72,12 @@
|
||||
<td><%= link_to booking.booking_id, transactions_booking_path(booking) %></td>
|
||||
<td><%= link_to booking.sale_id, transactions_sale_path(booking.sale_id) rescue '-' %></td>
|
||||
<td><%= booking.dining_facility.name rescue '' %></td>
|
||||
<td><%= booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></td>
|
||||
<td><%= booking.checkout_at.utc.getlocal.strftime("%I:%M %p") rescue '-' %></td>
|
||||
<td><%= booking.checkin_at.strftime("%I:%M %p") %></td>
|
||||
<td><%= booking.checkout_at.strftime("%I:%M %p") rescue '-' %></td>
|
||||
<td><%= booking.checkin_by rescue '-' %></td>
|
||||
<td><%= booking.checkout_by rescue '-' %></td>
|
||||
<td> <%= booking.booking_status %> </td>
|
||||
<td> <%= booking.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
<td> <%= booking.created_at.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% else %>
|
||||
|
||||
@@ -57,12 +57,12 @@
|
||||
<td><%= @booking.booking_id%></td>
|
||||
<td><%= link_to @booking.sale_id, transactions_sale_path(@booking.sale_id) rescue '-' %></td>
|
||||
<td><%= @booking.dining_facility.name rescue '' %></td>
|
||||
<td><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></td>
|
||||
<td><%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") rescue '-' %></td>
|
||||
<td><%= @booking.checkin_at.strftime("%I:%M %p") %></td>
|
||||
<td><%= @booking.checkout_at.strftime("%I:%M %p") rescue '-' %></td>
|
||||
<td><%= @booking.checkin_by rescue '-' %></td>
|
||||
<td><%= @booking.checkout_by rescue '-' %></td>
|
||||
<td><%= @booking.booking_status %> </td>
|
||||
<td><%= @booking.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
<td><%= @booking.created_at.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
<%if current_login_employee.role == "administrator" %>
|
||||
<%if (!@order.nil?) && (@booking.sale_id.nil?) %>
|
||||
<td></td>
|
||||
@@ -139,7 +139,7 @@
|
||||
<td><%= @sale.grand_total rescue '-' %></td>
|
||||
<td><%= @sale.cashier_name rescue '-' %></td>
|
||||
<td> <%= @sale.sale_status %> </td>
|
||||
<td> <%= @sale.receipt_date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
<td> <%= @sale.receipt_date.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
</tr>
|
||||
<% else %>
|
||||
<tr><td colspan="9"><strong><p style="text-align: center">There is no data ....</p></strong></td></tr>
|
||||
|
||||
@@ -98,10 +98,10 @@
|
||||
<tr>
|
||||
|
||||
<td><%= link_to cardSale.sale_id, transactions_sale_path(cardSale.sale_id) rescue '-' %></td>
|
||||
<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>
|
||||
|
||||
@@ -96,9 +96,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>
|
||||
|
||||
@@ -142,7 +142,7 @@
|
||||
<%= 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.requested_time.strftime("%Y-%m-%d %I:%M %p") %></td>
|
||||
<td><%= provider%></td>
|
||||
<td><%= order_reservation.status %></td>
|
||||
<td><%= order_reservation.payment_type%></td>
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
<tr>
|
||||
<td><%= @order_reservation.transaction_ref %></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.requested_time.strftime("%Y-%m-%d %I:%M %p") %></td>
|
||||
<td><%= @order_reservation.expected_waiting_time rescue '-' %></td>
|
||||
<td><%= @order_reservation.status %></td>
|
||||
<td><%= @order_reservation.payment_type %></td>
|
||||
@@ -66,7 +66,7 @@
|
||||
<td><%=item.qty rescue ' '%></td>
|
||||
<td><%= number_format(item.price > 0 ? item.price : item.unit_price, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
|
||||
<td><%= number_format(item.price > 0 ? item.qty * item.price : item.qty * item.unit_price, precision:precision.to_i, delimiter:delimiter) rescue ' '%></td>
|
||||
<td><%=l item.created_at.utc.getlocal , :format => :short rescue ' ' %></td>
|
||||
<td><%=l item.created_at , :format => :short rescue ' ' %></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
<td><%= order.order_type %></td>
|
||||
<td><%= order.customer.name rescue '-' %></td>
|
||||
<td><%= order.status %></td>
|
||||
<td> <%= order.date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
<td> <%= order.date.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
<td> <%= order.item_count %> </td>
|
||||
|
||||
</tr>
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
<td><%= @order.order_type %></td>
|
||||
<td><%= @order.customer.name rescue '-' %></td>
|
||||
<td><%= @order.status %></td>
|
||||
<td> <%= @order.date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
<td> <%= @order.date.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@@ -115,7 +115,7 @@
|
||||
<td><%= sale.grand_total rescue '-' %></td>
|
||||
<td><%= sale.cashier_name rescue '-' %></td>
|
||||
<td> <%= sale.sale_status %> </td>
|
||||
<td> <%= sale.receipt_date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
<td> <%= sale.receipt_date.strftime("%d-%m-%Y %I:%M %p") %> </td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% else %>
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
<td><%=s.qty rescue ' '%></td>
|
||||
<td><%= number_format(s.unit_price, :precision => 2, :delimiter => ',') rescue ' '%></td>
|
||||
<td><%= number_format(s.price, :precision => 2, :delimiter => ',') rescue ' '%></td>
|
||||
<td><%=l s.created_at.utc.getlocal , :format => :short rescue ' ' %></td>
|
||||
<td><%=l s.created_at , :format => :short rescue ' ' %></td>
|
||||
<td><%=s.remark rescue ' '%></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
@@ -75,9 +75,9 @@
|
||||
<tr>
|
||||
<td><%= shift_sale.employee.name%></td>
|
||||
<td><%=shift_sale.cashier_terminal.name%></td>
|
||||
<td><%= shift_sale.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') %>
|
||||
<td><%= shift_sale.shift_started_at.strftime('%d-%m-%Y %I:%M %p') %>
|
||||
</td>
|
||||
<td><%= shift_sale.shift_closed_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') rescue '-' %>
|
||||
<td><%= shift_sale.shift_closed_at.strftime('%d-%m-%Y %I:%M %p') rescue '-' %>
|
||||
</td>
|
||||
<td><%=shift_sale.opening_balance %></td>
|
||||
<td><%=shift_sale.closing_balance %></td>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
<tr style="border-bottom:2px solid #000">
|
||||
<td><%= @shift.employee.name%></td>
|
||||
<td><%=@shift.cashier_terminal.name%></td>
|
||||
<td><%= @shift.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') %>
|
||||
<td><%= @shift.shift_started_at.strftime('%d-%m-%Y %I:%M %p') %>
|
||||
</td>
|
||||
<td><%=@shift.opening_balance %></td>
|
||||
<td><%=@shift.closing_balance %></td>
|
||||
|
||||
Reference in New Issue
Block a user