git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove conflict text

Browse Source
This commit is contained in:
phyusin
2017-10-25 16:53:22 +06:30
parent 193ddc2486 fa5b544416
commit 98334531b2
137 changed files with 1952 additions and 1463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/views/settings/simple_menu_items/show.html.erb
View File

@@ -14,11 +14,12 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card">
<ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li>
<li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li>
<li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li>
<li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li>
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul>
</div>
</div>
@@ -26,17 +27,18 @@
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Item </h4>
<div class="body table-responsive">
<table class="table">
<thead>
<tr>
<th>Item code</th>
<th>Name</th>
<th>Alt name</th>
<!-- <th>Alt name</th> -->
<th>Type</th>
<th>Accout</th>
<th>Menu category</th>
<!-- <th>Menu category</th> -->
<!-- <th>Menu item</th> -->
<th>Min qty</th>
<!-- <th>Min qty</th> -->
<!-- <th>Min selectable item</th>
<th>Max selectable item</th> -->
<th>Created At</th>
@@ -48,15 +50,15 @@
<tr>
<td><%= @settings_menu_item.item_code %></td>
<td><%= @settings_menu_item.name rescue "-" %></td>
<td><%= @settings_menu_item.alt_name %></td>
<!-- <td><%= @settings_menu_item.alt_name %></td> -->
<td><%= @settings_menu_item.type %></td>
<td><%= @settings_menu_item.account.title %></td>
<td><%= @settings_menu_item.menu_category_id %></td>
<td><%= @settings_menu_item.min_qty %></td>
<!-- <td><%= @settings_menu_item.menu_category_id %></td> -->
<!-- <td><%= @settings_menu_item.min_qty %></td> -->
<td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
<td colspan="2">
<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' %>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_simple_menu_item_path(@category)%>" data-method="delete">
<%= t("views.btn.delete") %>
@@ -70,6 +72,7 @@
</tr>
</tbody>
</table>
</div>
</div>
</div>
@@ -110,8 +113,8 @@
<!-- <td><%= settings_menu_item.created_at.utc.getlocal.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-lg 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-lg waves-effect' %>
<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' %>
</td>
</tr>
<% end %>