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

Menu Item instances and OQS json saving

Browse Source
This commit is contained in:
PhyoTheingi
2017-06-03 17:09:56 +06:30
parent 2716b913f2
commit a01c4bd9cf
12 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/settings/menu_categories/show.html.erb
View File

@@ -37,7 +37,6 @@
</div>
<br>
<% if @settings_menu_category.menu_items.count > 0 %>
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Items
@@ -86,5 +85,4 @@
</table>
</div>
<% end %>
</div>

2
app/views/settings/menu_item_instances/_form.html.erb
View File

@@ -5,7 +5,7 @@
<%= f.input :item_instance_code %>
<%= f.input :item_instance_name %>
<%= f.input :price %>
<%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %>
<%= f.input :is_on_promotion %>
<%= f.input :promotion_price %>

2
app/views/settings/menu_item_instances/show.html.erb
View File

@@ -34,7 +34,7 @@
<td><%= @settings_menu_item_instances.is_on_promotion %></td>
<td><%= @settings_menu_item_instances.promotion_price %></td>
<td><%= @settings_menu_item_instances.is_available %></td>
<td><%=l @settings_menu_item_instances.created_at, format: :short %></td>
<td><%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<% if params[:simple_menu_item_id] %>
<td><%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td>
<% else %>

2
app/views/settings/menus/show.html.erb
View File

@@ -32,7 +32,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><%=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>
</tbody>

4
app/views/settings/set_menu_items/new.html.erb
View File

@@ -1,8 +1,6 @@
<!-- <h1>New Settings Menu Item</h1>
<%= render 'form', settings_menu_item: @settings_menu_item %>
<%= link_to 'Back', settings_menu_items_path %> -->
<%= render 'form', settings_menu_item: @settings_menu_item %> -->
<div class="span12">

5
app/views/settings/set_menu_items/show.html.erb
View File

@@ -100,7 +100,7 @@
<div class="card-block">
<h4 class="card-title">Menu Item Instances
<span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_set_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>
</span>
</h4>
@@ -129,6 +129,9 @@
<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><%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>

4
app/views/settings/simple_menu_items/new.html.erb
View File

@@ -1,8 +1,6 @@
<!-- <h1>New Settings Menu Item</h1>
<%= render 'form', settings_menu_item: @settings_menu_item %>
<%= link_to 'Back', settings_menu_items_path %> -->
<%= render 'form', settings_menu_item: @settings_menu_item %>-->
<div class="span12">

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

@@ -3,7 +3,7 @@
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
<li>Menu Item Option</li>
<li>Menu Item</li>
<span style="float: right">
</span>
</ul>