remove unnessary timezone convertion
This commit is contained in:
@@ -34,8 +34,8 @@
|
||||
<%= commissioner.employee.name rescue '-' %>
|
||||
</td>
|
||||
<td><%= commissioner.commission.name rescue '-' %></td>
|
||||
<td><%= commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
|
||||
<td><%= commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
|
||||
<td><%= commissioner.joined_date.strftime('%Y-%b-%d') rescue '-' %></td>
|
||||
<td><%= commissioner.resigned_date.strftime('%Y-%b-%d') rescue '-' %></td>
|
||||
<td><%= commissioner.is_active %></td>
|
||||
<td><%= link_to t("views.btn.show"), settings_commissioner_path(commissioner),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
<%= link_to t("views.btn.edit"), edit_settings_commissioner_path(commissioner),:class => 'btn btn-primary btn-sm waves-effect' %>
|
||||
|
||||
@@ -47,11 +47,11 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="width:20%"><%= t("views.right_panel.detail.joined_date") %></td>
|
||||
<td><%= @commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
|
||||
<td><%= @commissioner.joined_date.strftime('%Y-%b-%d') rescue '-' %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="width:20%"><%= t("views.right_panel.detail.resigned_date") %></td>
|
||||
<td><%= @commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
|
||||
<td><%= @commissioner.resigned_date.strftime('%Y-%b-%d') rescue '-' %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="width:20%"><%= t("views.right_panel.detail.active") %></td>
|
||||
|
||||
@@ -30,8 +30,8 @@
|
||||
<tr>
|
||||
<td><%= link_to employee.name,settings_employee_path(employee) %></td>
|
||||
<td><%= employee.role %></td>
|
||||
<td><%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= employee.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= employee.updated_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td>
|
||||
<%= link_to t("views.btn.edit"), edit_settings_employee_path(employee),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
</td>
|
||||
@@ -41,8 +41,8 @@
|
||||
<tr>
|
||||
<td><%= link_to employee.name,settings_employee_path(employee) %></td>
|
||||
<td><%= employee.role %></td>
|
||||
<td><%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= employee.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= employee.updated_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td>
|
||||
<%= link_to t("views.btn.edit"), edit_settings_employee_path(employee),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
</td>
|
||||
|
||||
@@ -35,11 +35,11 @@
|
||||
<% end%>
|
||||
<tr>
|
||||
<th><%= t("views.right_panel.detail.created_at") %></th>
|
||||
<td><%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= @employee.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><%= t("views.right_panel.detail.updated_at") %></th>
|
||||
<td><%= @employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= @employee.updated_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><%= t("views.right_panel.detail.employee_photo") %></th>
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
<td><%= @settings_menu_category.alt_name %></td>
|
||||
<td><%= @settings_menu_category.is_available rescue false%></td>
|
||||
<!-- <td><%= @settings_menu_category.order_by %></td> -->
|
||||
<td><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
|
||||
<td><%= @settings_menu_category.created_at.strftime("%Y-%m-%d") %></td>
|
||||
<td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %>
|
||||
|
||||
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_path(@settings_menu_category)%>" data-method="delete">
|
||||
@@ -98,7 +98,7 @@
|
||||
<td><%= settings_menu_item.parent.name rescue "-" %></td>
|
||||
<td><%= settings_menu_item.is_available %></td>
|
||||
<!-- <td><%= settings_menu_item.created_by %></td> -->
|
||||
<td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
|
||||
<td><%= settings_menu_item.created_at.strftime("%Y-%m-%d") %></td>
|
||||
|
||||
<% if settings_menu_item.type == "SimpleMenuItem" %>
|
||||
<td>
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
<td><%= @settings_menu_item_instances.is_default %></td>
|
||||
</tr>
|
||||
<tr><th><%= t("views.right_panel.detail.created_at") %></th>
|
||||
<td><%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= @settings_menu_item_instances.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
<td><%= settings_menu.is_active %></td>
|
||||
<!-- <td><%= settings_menu.created_by %></td> -->
|
||||
<!-- <td><%= settings_menu.created_at %></td> -->
|
||||
<!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
|
||||
<!-- <td><%= settings_menu.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
|
||||
<td>
|
||||
<%= link_to t("views.btn.edit"), edit_settings_menu_path(settings_menu),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
<a href="#" id="export-xlsx" data-attr="<%= settings_menu.id %>" class="export-xlsx btn btn-primary btn-sm waves-effect" style="height: 33px;">
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
<td><%= @settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %></td>
|
||||
<td><%= @settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %></td>
|
||||
<td><%= @settings_menu.created_by %></td>
|
||||
<td><%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
|
||||
<td><%= @settings_menu.created_at.strftime("%Y-%m-%d") %></td>
|
||||
<td><%= link_to t("views.btn.edit"), edit_settings_menu_path(@settings_menu),:class => 'btn btn-primary btn-sm waves-effect' %>
|
||||
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_path(@settings_menu)%>" data-method="delete">
|
||||
<%= t("views.btn.delete") %>
|
||||
@@ -91,7 +91,7 @@
|
||||
<td><%= category.menu_items.count %></td>
|
||||
<td><%= category.order_by %></td>
|
||||
<td><%= category.is_available %></td>
|
||||
<td><%= category.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= category.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu, category),:class => 'btn btn-info btn-sm waves-effect' %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
<td><%= pro.net_off rescue "-" %></td>
|
||||
<td><%= pro.net_price rescue "-" %></td>
|
||||
<td><%= pro.percentage %></td>
|
||||
<td><%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p"),:class => 'btn btn-primary btn-lg waves-effect' %>
|
||||
<td><%= pro.created_at.strftime("%Y-%m-%d/%I:%M %p"),:class => 'btn btn-primary btn-lg waves-effect' %>
|
||||
<%= link_to t("views.btn.edit"), edit_settings_promotion_promotion_product_path(pro),:class => 'btn btn-info btn-lg waves-effect' %>
|
||||
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_promotion_promotion_product_path(pro)%>" data-method="delete">
|
||||
<%= t("views.btn.delete") %>
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
<%= pro.created_by %>
|
||||
<% end %>
|
||||
</td>
|
||||
<td><%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= pro.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro),:class => 'btn btn-primary btn-sm waves-effect' %>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
<% else %>
|
||||
<td><%= room.created_by %></td>
|
||||
<% end %>
|
||||
<td><%= room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= room.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= link_to t("views.btn.edit"), edit_settings_zone_room_path(@zone,room),:class => 'btn btn-info btn-lg waves-effect' %>
|
||||
<%= link_to t("views.btn.delete"), settings_zone_room_path(@zone,room), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %></td>
|
||||
</tr>
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
<% else %>
|
||||
<td><%= @room.created_by %></td>
|
||||
<% end %>
|
||||
<td><%= @room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= @room.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= link_to t("views.btn.edit"), edit_settings_zone_room_path(@zone,@room),:class => 'btn btn-primary btn-sm waves-effect' %>
|
||||
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_zone_room_path(@zone,@room)%>" data-method="delete">
|
||||
<%= t("views.btn.delete") %>
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
<td><%= settings_menu_item.type %></td>
|
||||
<td><%= settings_menu_item.parent.name rescue "-" %></td>
|
||||
<!-- <td><%= settings_menu_item.created_by %></td> -->
|
||||
<td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
|
||||
<td><%= settings_menu_item.created_at.strftime("%Y-%m-%d") %></td>
|
||||
|
||||
<% if settings_menu_item.type == "SimpleMenuItem" %>
|
||||
<td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
<!-- <td><%= @settings_menu_item.menu_category_id %></td> -->
|
||||
<td><%= @settings_menu_item.min_qty %></td>
|
||||
<td><%= @settings_menu_item.is_available %></td>
|
||||
<td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
|
||||
<td><%= @settings_menu_item.created_at.strftime("%Y-%m-%d") %></td>
|
||||
<td colspan="2"><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_set_menu_item_path(@category, @settings_menu_item)%>" data-method="delete">
|
||||
<%= t("views.btn.delete") %>
|
||||
@@ -106,7 +106,7 @@
|
||||
<td><%= settings_menu_item.price %></td><!--
|
||||
<td><%= settings_menu_item.is_on_promotion %></td>
|
||||
<td><%= settings_menu_item.promotion_price %></td> -->
|
||||
<!-- <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
|
||||
<!-- <td><%= settings_menu_item.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
|
||||
<td><%= settings_menu_item.is_available %></td>
|
||||
<td><%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
<%= link_to t("views.btn.edit"), edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
<td><%= settings_menu_item.type %></td>
|
||||
<td><%= settings_menu_item.parent.name rescue "-" %></td>
|
||||
<!-- <td><%= settings_menu_item.created_by %></td> -->
|
||||
<td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
|
||||
<td><%= settings_menu_item.created_at.strftime("%Y-%m-%d") %></td>
|
||||
|
||||
<% if settings_menu_item.type == "SimpleMenuItem" %>
|
||||
<td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
<!-- <td><%= @settings_menu_item.menu_category_id %></td> -->
|
||||
<!-- <td><%= @settings_menu_item.min_qty %></td> -->
|
||||
<td><%= @settings_menu_item.is_available %></td>
|
||||
<td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
|
||||
<td><%= @settings_menu_item.created_at.strftime("%Y-%m-%d") %></td>
|
||||
|
||||
<td colspan="">
|
||||
<%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %>
|
||||
@@ -117,7 +117,7 @@
|
||||
<td><%= settings_menu_item.promotion_price %></td>
|
||||
<td><%= settings_menu_item.is_available %></td>
|
||||
|
||||
<!-- <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
|
||||
<!-- <td><%= settings_menu_item.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
|
||||
|
||||
<td><%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
<%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
<% else %>
|
||||
<td><%= table.created_by %></td>
|
||||
<% end %>
|
||||
<td><%= table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= table.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td>
|
||||
<%= link_to t("views.btn.show"), settings_zone_table_path(@zone,table),:class => 'btn btn-info btn-sm waves-effect' %>
|
||||
<%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,table),:class => "btn btn-info btn-sm waves-effect" %>
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
<% else %>
|
||||
<td><%= @table.created_by %></td>
|
||||
<% end %>
|
||||
<td><%= @table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= @table.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td>
|
||||
<%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@zone,@table),:class => 'btn btn-primary btn-sm waves-effect' %>
|
||||
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_zone_table_path(@table)%>" data-method="delete">
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
<% else %>
|
||||
<td><%= settings_table.created_by %></td>
|
||||
<% end %>
|
||||
<td><%= settings_table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= settings_table.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= link_to t("views.btn.edit"), edit_settings_zone_table_path(@settings_zone, settings_table),:class => 'btn btn-info btn-lg waves-effect' %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
@@ -100,7 +100,7 @@
|
||||
<% else %>
|
||||
<td><%= room.created_by %></td>
|
||||
<% end %>
|
||||
<td><%= room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= room.created_at.strftime("%Y-%m-%d/%I:%M %p") %></td>
|
||||
<td><%= link_to t("views.btn.edit") ,edit_settings_zone_room_path(@settings_zone, room),:class => 'btn btn-info btn-lg waves-effect' %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user