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

Merge branch 'r-1902001-01' into foodcourt

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-09-10 10:31:07 +06:30
parent 7dfcff5af5 5e8f08315c
commit b730da7a75
184 changed files with 2672 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/views/settings/simple_menu_items/edit.html.erb
View File

@@ -1,26 +1,24 @@
<!-- <div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
<li>Edit</li>
</ul>
</div>
<%= render 'form', settings_simple_menu_item: @settings_menu_item, item_sets: @item_sets %>
</div> -->
<% breadcrumb_add t('simple_menu_item'), settings_menu_category_path(@category), settings_menu_category_path(@category), t("views.btn.#{action_name}") %>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>"><%= t("en.simple_menu_item") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.edit") %></li>
<span class="float-right">
<%= link_to 'Back', settings_menu_category_path(@category) %>
</span>
</ol>
</div>
<br>
<%= render 'form', settings_simple_menu_item: @settings_menu_item, item_sets: @item_sets %>
<script type="text/javascript">
$(function(){
// auto selected after loaded
<%
<%
@settings_menu_item.item_sets.each do |set|
%>
$("#simple_menu_item_item_sets option[value='" + <%= set.id %> + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'});
<%
<%
end
%>

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

@@ -11,10 +11,10 @@
</div> -->
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item active"><%= t("views.right_panel.header.menu_items") %></li>
<span class="float-right">
<%= link_to 'Back', dashboard_path %>
<%= link_to 'Back', root_path %>
</span>
</ol>
</div>

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

@@ -1,21 +1,12 @@
<!-- <h1>New Settings Menu Item</h1>
<%= render 'form', settings_menu_item: @settings_menu_item %>-->
<!-- <div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
<li>New</li>
</ul>
</div>
<div class="row">
<div class="col-md-12">
<%= render 'form', settings_simple_menu_item: @settings_menu_item, item_attributes: @item_attributes, item_options: @item_options, item_sets: @item_sets %>
</div>
</div>
</div> -->
<% breadcrumb_add t('simple_menu_item'), settings_menu_category_path(@category), settings_menu_category_path(@category), t("views.btn.#{action_name}") %>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= settings_menu_category_path(@category) %>"><%= t("en.simple_menu_item") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
<span class="float-right">
<%= link_to 'Back', settings_menu_category_path(@category) %>
</span>
</ol>
</div>
<br>
<%= render 'form', settings_simple_menu_item: @settings_menu_item, item_attributes: @item_attributes, item_options: @item_options, item_sets: @item_sets %>
<%= render 'form', settings_simple_menu_item: @settings_menu_item, item_attributes: @item_attributes, item_options: @item_options, item_sets: @item_sets %>

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

@@ -1,4 +1,14 @@
<% breadcrumb_add t('views.right_panel.header.menu_item'), settings_menu_category_path(@category), settings_menu_category_path(@category), t('details') %>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= settings_menu_category_path(@category) %>"><%= t("views.right_panel.header.menu_item") %></a></li>
<li class="breadcrumb-item active"><%= t :details %></li>
<span class="float-right">
<%= link_to 'Back', settings_menu_category_path(@category) %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
@@ -100,7 +110,7 @@
<td><%= settings_menu_item.item_instance_code %></td>
<td><%= settings_menu_item.item_instance_name %></td>
<td>
<%= MenuItemAttribute.where(id: settings_menu_item.item_attributes).pluck(:name) %>
<%= MenuItemAttribute.where(id: settings_menu_item.item_attributes).pluck(:name) %>
</td>
<td><%= settings_menu_item.price %></td>
<!-- <td><%= settings_menu_item.is_on_promotion %></td> -->