origin pull master

This commit is contained in:
Aung Myo
2017-06-03 13:44:10 +06:30
parent 7529d23147
commit 138850fb24
119 changed files with 2531 additions and 462 deletions

View File

@@ -2,9 +2,8 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Settings</li>
<li>Menu</li>
<li><a href="<%= root_path %>">Home</a></li>
<li>Menus</li>
<span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_path,:class => 'btn btn-primary btn-sm' %>
</span>
@@ -35,10 +34,12 @@
<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><%=l settings_menu.created_at, format: :short %></td>
<!-- <td><%=l settings_menu.created_at, format: :short %></td> -->
<td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<td><%= link_to 'Edit', edit_settings_menu_path(settings_menu) %></td>
</tr>
<% end %>
</tbody>
</table>
</div>
<%= paginate @settings_menus, param_name: :page, :outer_window => 3 %>

View File

@@ -1,8 +1,8 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Settings</li>
<li>Menu</li>
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_menus_path %>">Menus</a></li>
<li>Details</li>
<span style="float: right">
</span>
</ul>
@@ -62,13 +62,13 @@
</thead>
<tbody>
<% @settings_menu.menu_categories.each do |category|%>
<% @settings_menu_categories.each do |category|%>
<tr>
<td><%= link_to category.name, settings_menu_category_path(category) %></td>
<td><%= category.children.count rescue "-" %></td>
<td><%= category.menu_items.count %></td>
<td><%= category.order_by %></td>
<td><%=l category.created_at, format: :short %></td>
<td><%= category.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<td><%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu, category) %></td>
</tr>
<% end %>
@@ -76,3 +76,4 @@
</table>
</div>
</div>
<%= paginate @settings_menu_categories, param_name: :page, :outer_window => 3 %>