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

Menu 2nd Phrase

Browse Source
This commit is contained in:
PhyoTheingi
2017-05-31 18:27:31 +06:30
parent fda69012da
commit a67c76d945
13 changed files with 80 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/settings/menu_categories_controller.rb
View File

@@ -5,7 +5,7 @@ class Settings::MenuCategoriesController < ApplicationController
# GET /settings/menu_categories
# GET /settings/menu_categories.json
def index
@settings_menu_categories = MenuCategory.all
@settings_menu_categories = MenuCategory.all.page(params[:page]).per(10)
end
# GET /settings/menu_categories/1
@@ -63,7 +63,7 @@ class Settings::MenuCategoriesController < ApplicationController
# DELETE /settings/menu_categories/1
# DELETE /settings/menu_categories/1.json
def destroy
@settings_menu_category.destroy
# @settings_menu_category.destroy
respond_to do |format|
format.html { redirect_to settings_menu_categories_path, notice: 'Menu category was successfully destroyed.' }
format.json { head :no_content }

7
app/controllers/settings/menus_controller.rb
View File

@@ -4,12 +4,13 @@ class Settings::MenusController < ApplicationController
# GET /settings/menus
# GET /settings/menus.json
def index
@settings_menus = Menu.all
@settings_menus = Menu.all.page(params[:page]).per(10)
end
# GET /settings/menus/1
# GET /settings/menus/1.json
def show
@settings_menu_categories = @settings_menu.menu_categories.page(params[:page]).per(10)
end
# GET /settings/menus/new
@@ -25,7 +26,7 @@ class Settings::MenusController < ApplicationController
# POST /settings/menus.json
def create
@settings_menu = Menu.new(settings_menu_params)
@settings_menu.created_by = current_login_employee.name
respond_to do |format|
if @settings_menu.save
format.html { redirect_to settings_menus_path, notice: 'Menu was successfully created.' }
@@ -42,7 +43,7 @@ class Settings::MenusController < ApplicationController
def update
respond_to do |format|
if @settings_menu.update(settings_menu_params)
format.html { redirect_to settings_menu_path(@settings_menu), notice: 'Menu was successfully updated.' }
format.html { redirect_to settings_menus_path, notice: 'Menu was successfully updated.' }
format.json { render :show, status: :ok, location: @settings_menu }
else
format.html { render :edit }

4
app/controllers/settings/set_menu_items_controller.rb
View File

@@ -28,7 +28,7 @@ class Settings::SetMenuItemsController < ApplicationController
respond_to do |format|
if @settings_menu_item.save
format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully created.' }
format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully created.' }
format.json { render :show, status: :created, location: @settings_menu_item }
else
format.html { render :new }
@@ -42,7 +42,7 @@ class Settings::SetMenuItemsController < ApplicationController
def update
respond_to do |format|
if @settings_menu_item.update(settings_menu_item_params)
format.html { redirect_to settings_menu_item_path(@settings_menu_item), notice: 'Menu item was successfully updated.' }
format.html { redirect_to settings_menu_category_set_menu_items_path(@settings_menu_item), notice: 'Menu item was successfully updated.' }
format.json { render :show, status: :ok, location: @settings_menu_item }
else
format.html { render :edit }

17
app/controllers/settings/simple_menu_items_controller.rb
View File

@@ -1,12 +1,12 @@
class Settings::SimpleMenuItemsController < ApplicationController
before_action :set_settings_menu_item, only: [:show, :edit, :update, :destroy]
before_action :set_settings_menu_category, only: [:index, :show, :edit, :new]
before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update]
# GET /settings/menu_items
# GET /settings/menu_items.json
def index
@settings_menu_items = @category.menu_items
end
# GET /settings/menu_items/1
# GET /settings/menu_items/1.json
def show
@@ -25,10 +25,13 @@ class Settings::SimpleMenuItemsController < ApplicationController
# POST /settings/menu_items.json
def create
@settings_menu_item = MenuItem.new(settings_menu_item_params)
if params[:menu_item_id].nil?
@settings_menu_item.menu_category_id = params[:menu_category_id]
end
@settings_menu_item.created_by = current_login_employee.name
respond_to do |format|
if @settings_menu_item.save
format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully created.' }
format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully created.' }
format.json { render :show, status: :created, location: @settings_menu_item }
else
format.html { render :new }
@@ -42,7 +45,7 @@ class Settings::SimpleMenuItemsController < ApplicationController
def update
respond_to do |format|
if @settings_menu_item.update(settings_menu_item_params)
format.html { redirect_to settings_menu_item_path(@settings_menu_item), notice: 'Menu item was successfully updated.' }
format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully updated.' }
format.json { render :show, status: :ok, location: @settings_menu_item }
else
format.html { render :edit }
@@ -54,9 +57,9 @@ class Settings::SimpleMenuItemsController < ApplicationController
# DELETE /settings/menu_items/1
# DELETE /settings/menu_items/1.json
def destroy
@settings_menu_item.destroy
# @settings_menu_item.destroy
respond_to do |format|
format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully destroyed.' }
format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully destroyed.' }
format.json { head :no_content }
end
end

4
app/models/menu.rb
View File

@@ -1,8 +1,8 @@
class Menu < ApplicationRecord
has_many :menu_categories, dependent: :destroy
validates_presence_of :name, :is_active, :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
#Default Scope to pull the active version only
default_scope { where(is_active: true).order("created_at desc") }

1
app/views/settings/menu_categories/index.html.erb
View File

@@ -40,3 +40,4 @@
</tbody>
</table>
</div>
<%= paginate @settings_menu_categories, param_name: :page, :outer_window => 3 %>

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

@@ -1,15 +1,12 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Settings</li>
<li>Menu category</li>
<li><a href="<%= settings_menu_categories_path %>">Menus Categories</a></li>
<li>Details</li>
<span style="float: right">
</span>
</ul>
</div>
<br/>
</div>
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Category</h4>
@@ -47,20 +44,41 @@
<%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %>
<%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %>
</span>
</h4>
</span></h4>
<table class="table">
<thead>
<tr>
<th>Item code</th>
<th>Name</th>
<th>Alt name</th>
<th>Type</th>
<th>Parent Item</th>
<th>Created by</th>
<th>Created at</th>
<th colspan="3"></th>
</tr>
</thead>
<% settings_menu_items = @settings_menu_category.menu_items %>
<tbody>
<% settings_menu_items.each do |settings_menu_item| %>
<tr>
<td><%= settings_menu_item.item_code %></td>
<td><%= settings_menu_item.name %></td>
<td><%= settings_menu_item.alt_name %></td>
<td><%= settings_menu_item.type %></td>
<td><%= settings_menu_item.parent.name rescue "-" %></td>
<td><%= settings_menu_item.created_by %></td>
<td><%=l settings_menu_item.created_at, :format => :short %></td>
<td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
</div>

9
app/views/settings/menus/index.html.erb
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 %>

11
app/views/settings/menus/show.html.erb
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 %>

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

@@ -1,4 +1,4 @@
<%= simple_form_for([:settings,:menu_category, @settings_menu_item]) do |f| %>
<%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">

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

@@ -1,17 +1,14 @@
<!-- <h1>Editing Settings Menu Item</h1>
<%= render 'form', settings_menu_item: @settings_menu_item %>
<%= link_to 'Show', @settings_menu_item %> |
<%= link_to 'Back', settings_menu_items_path %> -->
<%= 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_items_path %>">Menu Items</a></li>
<li><a href="">Menu Items</a></li>
<li>Edit</li>
</ul>
</div>
<%= render 'form', settings_menu_item: @settings_menu_item %>
<%= render 'form', settings_simple_menu_item: @settings_menu_item %>
</div>

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

@@ -5,7 +5,7 @@
<li>Menu Items</li>
<span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_simple_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
</span>
</ul>
</div>
@@ -40,7 +40,13 @@
<br/>
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Items</h4>
<h4 class="card-title">Menu Items
<span style="float: right">
<%= link_to "New Simple Menu Item",new_settings_menu_category_simple_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>
<h4 class="card-title"><%= @settings_menu_items.count %></h4>
<table class="table">
<thead>
<tr>
@@ -67,9 +73,9 @@
<td><%= settings_menu_item.created_by %></td>
<td><%=l settings_menu_item.created_at, :format => :short %></td>
<td><%= link_to 'Show', settings_menu_category_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<td><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td>
<td><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>

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

@@ -36,13 +36,13 @@
<td><%= @settings_menu_item.name rescue "-" %></td>
<td><%= @settings_menu_item.alt_name %></td>
<td><%= @settings_menu_item.type %></td>
<td><%= @settings_menu_item.menu_category %></td>
<td><%= @settings_menu_item.menu_item %></td>
<td><%= @settings_menu_item.menu_qty %></td>
<td><%= @settings_menu_item.menu_category_id %></td>
<td><%= @settings_menu_item.menu_item_id %></td>
<td><%= @settings_menu_item.min_qty %></td>
<td><%= @settings_menu_item.min_selectable_item %></td>
<td><%= @settings_menu_item.max_selectable_item %></td>
<td><%=l @settings_menu_item.created_at, format: :short %></td>
<td><%= link_to 'Edit', edit_settings_menu_menu_item_path(@settings_menu_category, @settings_menu_category) %></td>
<td><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item) %></td>
</tr>
</tbody>
</table>