This commit is contained in:
PhyoTheingi
2017-06-01 14:00:08 +06:30
parent 03bf799708
commit a7d7260157
11 changed files with 15 additions and 13 deletions

View File

@@ -4,7 +4,7 @@ class Settings::SetMenuItemsController < ApplicationController
# GET /settings/menu_items # GET /settings/menu_items
# GET /settings/menu_items.json # GET /settings/menu_items.json
def index def index
@settings_menu_items = @category.menu_items @settings_menu_items = @category.menu_items.page(params[:page]).per(10)
end end
# GET /settings/menu_items/1 # GET /settings/menu_items/1
@@ -15,6 +15,7 @@ class Settings::SetMenuItemsController < ApplicationController
# GET /settings/menu_items/new # GET /settings/menu_items/new
def new def new
@settings_menu_item = MenuItem.new @settings_menu_item = MenuItem.new
@settings_menu_item.type = "SetMenuItem"
end end
# GET /settings/menu_items/1/edit # GET /settings/menu_items/1/edit

View File

@@ -4,7 +4,7 @@ class Settings::SimpleMenuItemsController < ApplicationController
# GET /settings/menu_items # GET /settings/menu_items
# GET /settings/menu_items.json # GET /settings/menu_items.json
def index def index
@settings_menu_items = @category.menu_items @settings_menu_items = @category.menu_items.page(params[:page]).per(10)
end end
# GET /settings/menu_items/1 # GET /settings/menu_items/1

View File

@@ -2,7 +2,7 @@ class Menu < ApplicationRecord
has_many :menu_categories, dependent: :destroy has_many :menu_categories, dependent: :destroy
validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to
validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i, :on => :create validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i
#Default Scope to pull the active version only #Default Scope to pull the active version only
default_scope { where(is_active: true).order("created_at desc") } default_scope { where(is_active: true).order("created_at desc") }

View File

@@ -9,7 +9,7 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li> <li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_menu_items_path %>">Menu Items</a></li> <li><a href="<%= settings_menu_category_set_menu_items_path(@cattegory) %>">Menu Category</a></li>
<li>Edit</li> <li>Edit</li>
</ul> </ul>
</div> </div>

View File

@@ -1,7 +1,7 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li> <li><a href="<%= %>">Home</a></li>
<li>Settings</li> <li><a href="<%= settings_menu_categories_path %>">Menus Categories</a></li>
<li>Menu Items</li> <li>Menu Items</li>
<span style="float: right"> <span style="float: right">
@@ -78,3 +78,4 @@
</div> </div>
</div> </div>
<%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %>

View File

@@ -9,7 +9,7 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li> <li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_menu_items_path %>">Menu Items</a></li> <li><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
<li>New</li> <li>New</li>
</ul> </ul>
</div> </div>

View File

@@ -2,8 +2,8 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li> <li><a href="<%= %>">Home</a></li>
<li>Settings</li> <li><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
<li>Menu Item Option</li> <li>Menu Item</li>
<span style="float: right"> <span style="float: right">
</span> </span>
</ul> </ul>

View File

@@ -6,7 +6,7 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li> <li><a href="<%= root_path %>">Home</a></li>
<li><a href="">Menu Items</a></li> <li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
<li>Edit</li> <li>Edit</li>
</ul> </ul>
</div> </div>

View File

@@ -1,7 +1,7 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li> <li><a href="<%= %>">Home</a></li>
<li>Settings</li> <li><a href="<%= settings_menu_categories_path %>">Menus Categories</a></li>
<li>Menu Items</li> <li>Menu Items</li>
<span style="float: right"> <span style="float: right">
@@ -46,7 +46,6 @@
<%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %> <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
</span></h4> </span></h4>
<h4 class="card-title"><%= @settings_menu_items.count %></h4>
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
@@ -84,3 +83,4 @@
</div> </div>
</div> </div>
<%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %>

View File

@@ -9,7 +9,7 @@
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li> <li><a href="<%= root_path %>">Home</a></li>
<li><!-- <a href="<%= settings_menu_items_path %>"> -->Menu Items<!-- </a> --></li> <li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
<li>New</li> <li>New</li>
</ul> </ul>
</div> </div>

View File

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