From a7d7260157f0402ce9d71e4c2700a79f282d8282 Mon Sep 17 00:00:00 2001 From: PhyoTheingi Date: Thu, 1 Jun 2017 14:00:08 +0630 Subject: [PATCH 1/7] Bug Fix --- app/controllers/settings/set_menu_items_controller.rb | 3 ++- app/controllers/settings/simple_menu_items_controller.rb | 2 +- app/models/menu.rb | 2 +- app/views/settings/set_menu_items/edit.html.erb | 2 +- app/views/settings/set_menu_items/index.html.erb | 3 ++- app/views/settings/set_menu_items/new.html.erb | 2 +- app/views/settings/set_menu_items/show.html.erb | 4 ++-- app/views/settings/simple_menu_items/edit.html.erb | 2 +- app/views/settings/simple_menu_items/index.html.erb | 4 ++-- app/views/settings/simple_menu_items/new.html.erb | 2 +- app/views/settings/simple_menu_items/show.html.erb | 2 +- 11 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index 438b2f08..b488ac6f 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -4,7 +4,7 @@ class Settings::SetMenuItemsController < ApplicationController # GET /settings/menu_items # GET /settings/menu_items.json def index - @settings_menu_items = @category.menu_items + @settings_menu_items = @category.menu_items.page(params[:page]).per(10) end # GET /settings/menu_items/1 @@ -15,6 +15,7 @@ class Settings::SetMenuItemsController < ApplicationController # GET /settings/menu_items/new def new @settings_menu_item = MenuItem.new + @settings_menu_item.type = "SetMenuItem" end # GET /settings/menu_items/1/edit diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index e81d6817..6b3c4bb4 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -4,7 +4,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items # GET /settings/menu_items.json def index - @settings_menu_items = @category.menu_items + @settings_menu_items = @category.menu_items.page(params[:page]).per(10) end # GET /settings/menu_items/1 diff --git a/app/models/menu.rb b/app/models/menu.rb index ac9ea4d3..0c956a1e 100644 --- a/app/models/menu.rb +++ b/app/models/menu.rb @@ -2,7 +2,7 @@ class Menu < ApplicationRecord has_many :menu_categories, dependent: :destroy 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 { where(is_active: true).order("created_at desc") } diff --git a/app/views/settings/set_menu_items/edit.html.erb b/app/views/settings/set_menu_items/edit.html.erb index 40c675ef..abe7cea7 100644 --- a/app/views/settings/set_menu_items/edit.html.erb +++ b/app/views/settings/set_menu_items/edit.html.erb @@ -9,7 +9,7 @@
diff --git a/app/views/settings/set_menu_items/index.html.erb b/app/views/settings/set_menu_items/index.html.erb index 89fc850f..f497027c 100644 --- a/app/views/settings/set_menu_items/index.html.erb +++ b/app/views/settings/set_menu_items/index.html.erb @@ -1,7 +1,7 @@
+ <%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %> diff --git a/app/views/settings/set_menu_items/new.html.erb b/app/views/settings/set_menu_items/new.html.erb index bfc07ae3..7b234827 100644 --- a/app/views/settings/set_menu_items/new.html.erb +++ b/app/views/settings/set_menu_items/new.html.erb @@ -9,7 +9,7 @@
diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb index 66ae3e84..271039ef 100644 --- a/app/views/settings/set_menu_items/show.html.erb +++ b/app/views/settings/set_menu_items/show.html.erb @@ -2,8 +2,8 @@
diff --git a/app/views/settings/simple_menu_items/edit.html.erb b/app/views/settings/simple_menu_items/edit.html.erb index 5d4d9b8e..07849c07 100644 --- a/app/views/settings/simple_menu_items/edit.html.erb +++ b/app/views/settings/simple_menu_items/edit.html.erb @@ -6,7 +6,7 @@
diff --git a/app/views/settings/simple_menu_items/index.html.erb b/app/views/settings/simple_menu_items/index.html.erb index 6de3d619..ac840784 100644 --- a/app/views/settings/simple_menu_items/index.html.erb +++ b/app/views/settings/simple_menu_items/index.html.erb @@ -1,7 +1,7 @@
  • Home
    • -
  • Settings
    • +
  • Menus Categories
  • Menu Items
    • @@ -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' %> -

    <%= @settings_menu_items.count %>

    @@ -84,3 +83,4 @@ + <%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %> diff --git a/app/views/settings/simple_menu_items/new.html.erb b/app/views/settings/simple_menu_items/new.html.erb index a9bf5dee..2f3cb6a4 100644 --- a/app/views/settings/simple_menu_items/new.html.erb +++ b/app/views/settings/simple_menu_items/new.html.erb @@ -9,7 +9,7 @@
    diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index f69c83d4..60e7c596 100644 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -2,7 +2,7 @@
    • Home
      • -
    • Settings
      • +
    • Menu Category
    • Menu Item Option
      • From 89c6228c318cc4c228174ee1b3340ef3988b1010 Mon Sep 17 00:00:00 2001 From: PhyoTheingi Date: Thu, 1 Jun 2017 17:10:04 +0630 Subject: [PATCH 2/7] UI phrase 1 --- app/assets/stylesheets/settings.scss | 32 ++++++++++++++++++++++++++ app/views/layouts/_header.html.erb | 8 +++---- app/views/layouts/application.html.erb | 1 + config/initializers/assets.rb | 2 ++ 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 app/assets/stylesheets/settings.scss diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss new file mode 100644 index 00000000..37064f07 --- /dev/null +++ b/app/assets/stylesheets/settings.scss @@ -0,0 +1,32 @@ +@import "bootstrap"; +@import "font-awesome"; +@import "theme"; + +/* Show it is fixed to the top */ +// body { +// min-height: 75rem; +// padding-top: 4.5rem; +// } + +.setting_nav{ + background-color: #2f5663; +} + +ul.navbar-nav li a{ + text-decoration :none; + color :#e6e6e6; +} + +ul.dropdown-menu li a{ + text-decoration :none; + color :#525252; +} + +.setting_breadcrumb{ + background-color: transparent !important; + margin-bottom: 0px !important; +} +.page-header{ + border-bottom :0px solid #000 !important; + margin :0px !important; +} \ No newline at end of file diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index b73cc5ae..47c10ac9 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,8 +1,8 @@ -
    - + <% if settings_menu_item.type == "SimpleMenuItem" %> + <% else %> + + + + <% end %> <% end %> diff --git a/app/views/settings/menu_item_attributes/show.html.erb b/app/views/settings/menu_item_attributes/show.html.erb index 5517c716..35e4e6ab 100644 --- a/app/views/settings/menu_item_attributes/show.html.erb +++ b/app/views/settings/menu_item_attributes/show.html.erb @@ -2,7 +2,7 @@
    • Home
      • -
    • Settings
      • +
    • Menu Item Attributes
    • Menu Item Attribute
      • diff --git a/app/views/settings/menu_item_options/edit.html.erb b/app/views/settings/menu_item_options/edit.html.erb index 487a55e7..9c9da591 100644 --- a/app/views/settings/menu_item_options/edit.html.erb +++ b/app/views/settings/menu_item_options/edit.html.erb @@ -4,7 +4,7 @@
      diff --git a/app/views/settings/set_menu_items/edit.html.erb b/app/views/settings/set_menu_items/edit.html.erb index abe7cea7..158b7c1c 100644 --- a/app/views/settings/set_menu_items/edit.html.erb +++ b/app/views/settings/set_menu_items/edit.html.erb @@ -1,17 +1,12 @@ - +
      - <%= render 'form', settings_menu_item: @settings_menu_item %> + <%= render 'form', settings_set_menu_item: @settings_menu_item %>
      diff --git a/app/views/settings/set_menu_items/index.html.erb b/app/views/settings/set_menu_items/index.html.erb index f497027c..bfe6a99f 100644 --- a/app/views/settings/set_menu_items/index.html.erb +++ b/app/views/settings/set_menu_items/index.html.erb @@ -5,7 +5,7 @@
    • Menu Items
      • - <%= 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_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>
    @@ -40,7 +40,13 @@
    -

    Menu Items

    +

    Menu Items + + <%= 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' %> + + +

    <%= settings_menu_item.parent.name rescue "-" %> <%= settings_menu_item.created_by %> <%=l settings_menu_item.created_at, :format => :short %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ) %> <%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item) %> <%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>
    @@ -67,9 +73,15 @@ - - - + <% if settings_menu_item.type == "SimpleMenuItem" %> + + + + <% else %> + + + + <% end %> <% end %> diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb index 271039ef..a76f851a 100644 --- a/app/views/settings/set_menu_items/show.html.erb +++ b/app/views/settings/set_menu_items/show.html.erb @@ -36,13 +36,13 @@ - - - + + + - +
    <%= settings_menu_item.created_by %> <%=l settings_menu_item.created_at, :format => :short %><%= link_to 'Show', settings_menu_category_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>
    <%= @settings_menu_item.name rescue "-" %> <%= @settings_menu_item.alt_name %> <%= @settings_menu_item.type %><%= @settings_menu_item.menu_category %><%= @settings_menu_item.menu_item %><%= @settings_menu_item.menu_qty %><%= @settings_menu_item.menu_category_id %><%= @settings_menu_item.menu_item_id %><%= @settings_menu_item.min_qty %> <%= @settings_menu_item.min_selectable_item %> <%= @settings_menu_item.max_selectable_item %> <%=l @settings_menu_item.created_at, format: :short %><%= link_to 'Edit', edit_settings_menu_menu_item_path(@settings_menu_category, @settings_menu_category) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item) %>
    diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb index d187847a..885f725e 100644 --- a/app/views/settings/simple_menu_items/_form.html.erb +++ b/app/views/settings/simple_menu_items/_form.html.erb @@ -5,6 +5,7 @@ <%= f.input :item_code %> <%= f.input :name %> <%= f.input :alt_name %> + <%= f.input :type %> <%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %> <%= f.input :min_qty %> <%= f.input :min_selectable_item %> diff --git a/app/views/settings/simple_menu_items/index.html.erb b/app/views/settings/simple_menu_items/index.html.erb index ac840784..4a9efb75 100644 --- a/app/views/settings/simple_menu_items/index.html.erb +++ b/app/views/settings/simple_menu_items/index.html.erb @@ -72,9 +72,15 @@ <%= settings_menu_item.created_by %> <%=l settings_menu_item.created_at, :format => :short %> + <% if settings_menu_item.type == "SimpleMenuItem" %> <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %> <%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %> <%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> + <% else %> + <%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %> + <%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %> + <%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> + <% end %> <% end %> From 7020d4957a9e23670782b37c63f869fa3b011506 Mon Sep 17 00:00:00 2001 From: PhyoTheingi Date: Thu, 1 Jun 2017 18:44:30 +0630 Subject: [PATCH 4/7] constraint to min_qty --- app/controllers/settings/simple_menu_items_controller.rb | 4 ++-- app/models/menu_item.rb | 1 + app/views/settings/set_menu_items/new.html.erb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 6b3c4bb4..4057cf72 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -1,6 +1,6 @@ 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, :update] + before_action :set_settings_menu_item, only: [:show, :edit, :update, :destroy ] + before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update ,:create] # GET /settings/menu_items # GET /settings/menu_items.json def index diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 70528e83..e84ce61e 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -3,6 +3,7 @@ class MenuItem < ApplicationRecord has_many :menu_item_instances belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" + validates_presence_of :item_code, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item default_scope { order('item_code asc') } diff --git a/app/views/settings/set_menu_items/new.html.erb b/app/views/settings/set_menu_items/new.html.erb index 7b234827..6c7b6e76 100644 --- a/app/views/settings/set_menu_items/new.html.erb +++ b/app/views/settings/set_menu_items/new.html.erb @@ -13,5 +13,5 @@
  • New
- <%= render 'form', settings_menu_item: @settings_menu_item %> + <%= render 'form', settings_set_menu_item: @settings_menu_item %>
From 0fa9cd0cacd4b8269791aceb4ed5500fbb6ca0df Mon Sep 17 00:00:00 2001 From: PhyoTheingi Date: Fri, 2 Jun 2017 09:50:48 +0630 Subject: [PATCH 5/7] Sub Menu Item Showing --- .../settings/set_menu_items_controller.rb | 1 + .../settings/simple_menu_items_controller.rb | 1 + .../settings/set_menu_items/show.html.erb | 46 ++++++++++++++++++- .../settings/simple_menu_items/show.html.erb | 46 ++++++++++++++++++- 4 files changed, 92 insertions(+), 2 deletions(-) diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index b488ac6f..cc5e89e8 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -10,6 +10,7 @@ class Settings::SetMenuItemsController < ApplicationController # GET /settings/menu_items/1 # GET /settings/menu_items/1.json def show + @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) end # GET /settings/menu_items/new diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 4057cf72..2a391d8f 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -10,6 +10,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items/1 # GET /settings/menu_items/1.json def show + @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) end # GET /settings/menu_items/new diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb index a76f851a..238fa038 100644 --- a/app/views/settings/set_menu_items/show.html.erb +++ b/app/views/settings/set_menu_items/show.html.erb @@ -9,7 +9,6 @@ -

Menu Item

@@ -48,5 +47,50 @@
+
+
+
+

Sub Menu Items

+ + + + + + + + + + + + + + + + <% @sub_menu.each do |settings_menu_item| %> + + + + + + + + + + <% if settings_menu_item.type == "SimpleMenuItem" %> + + + + <% else %> + + + + <% end %> + + <% end %> + +
Item codeNameAlt nameTypeParent ItemCreated byCreated at
<%= settings_menu_item.item_code %><%= settings_menu_item.name %><%= settings_menu_item.alt_name %><%= settings_menu_item.type %><%= settings_menu_item.parent.name rescue "-" %><%= settings_menu_item.created_by %><%=l settings_menu_item.created_at, :format => :short %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>
+
+
+ <%= paginate @sub_menu, param_name: :page, :outer_window => 3 %> diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index 60e7c596..97e12695 100644 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -9,7 +9,6 @@ -

Menu Item

@@ -48,5 +47,50 @@
+
+
+
+

Sub Menu Items

+ + + + + + + + + + + + + + + + <% @sub_menu.each do |settings_menu_item| %> + + + + + + + + + + <% if settings_menu_item.type == "SimpleMenuItem" %> + + + + <% else %> + + + + <% end %> + + <% end %> + +
Item codeNameAlt nameTypeParent ItemCreated byCreated at
<%= settings_menu_item.item_code %><%= settings_menu_item.name %><%= settings_menu_item.alt_name %><%= settings_menu_item.type %><%= settings_menu_item.parent.name rescue "-" %><%= settings_menu_item.created_by %><%=l settings_menu_item.created_at, :format => :short %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>
+
+
+ <%= paginate @sub_menu, param_name: :page, :outer_window => 3 %> From 0c82c162935a874d9e4648dbdf3d6ad015743156 Mon Sep 17 00:00:00 2001 From: PhyoTheingi Date: Fri, 2 Jun 2017 11:38:46 +0630 Subject: [PATCH 6/7] Order Queue Station Bug Fix --- .../settings/order_queue_stations_controller.rb | 6 +++--- .../settings/order_queue_stations/edit.html.erb | 16 ++++++++++++---- .../settings/order_queue_stations/show.html.erb | 8 ++++++++ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb index ec85e56a..e0cf0d08 100644 --- a/app/controllers/settings/order_queue_stations_controller.rb +++ b/app/controllers/settings/order_queue_stations_controller.rb @@ -1,5 +1,5 @@ class Settings::OrderQueueStationsController < ApplicationController - before_action :set_settings_order_queue_station, only: [:show, :edit,:new, :update, :destroy] + before_action :set_settings_order_queue_station, only: [:show, :edit, :update, :destroy] # GET /settings/order_queue_stations # GET /settings/order_queue_stations.json @@ -25,10 +25,10 @@ class Settings::OrderQueueStationsController < ApplicationController # POST /settings/order_queue_stations.json def create @settings_order_queue_station = OrderQueueStation.new(settings_order_queue_station_params) - + @settings_order_queue_station.created_by = current_login_employee.name respond_to do |format| if @settings_order_queue_station.save - format.html { redirect_to @settings_order_queue_station, notice: 'Order queue station was successfully created.' } + format.html { redirect_to settings_order_queue_stations_path, notice: 'Order queue station was successfully created.' } format.json { render :show, status: :created, location: @settings_order_queue_station } else format.html { render :new } diff --git a/app/views/settings/order_queue_stations/edit.html.erb b/app/views/settings/order_queue_stations/edit.html.erb index af08ffda..27cf2fc8 100644 --- a/app/views/settings/order_queue_stations/edit.html.erb +++ b/app/views/settings/order_queue_stations/edit.html.erb @@ -1,6 +1,14 @@ -

Editing Settings Order Queue Station

+ -<%= link_to 'Show', @settings_order_queue_station %> | -<%= link_to 'Back', settings_order_queue_stations_path %> +
+
+ +
+ <%= render 'form', settings_order_queue_station: @settings_order_queue_station %> +
\ No newline at end of file diff --git a/app/views/settings/order_queue_stations/show.html.erb b/app/views/settings/order_queue_stations/show.html.erb index 00004528..1a80c2c0 100644 --- a/app/views/settings/order_queue_stations/show.html.erb +++ b/app/views/settings/order_queue_stations/show.html.erb @@ -1,3 +1,11 @@ +
+ +
+

<%= notice %>

From f89a4237df18cf7172c29248975a87d4079659a8 Mon Sep 17 00:00:00 2001 From: PhyoTheingi Date: Fri, 2 Jun 2017 14:02:03 +0630 Subject: [PATCH 7/7] Menu Item Instance --- .../menu_item_instances_controller.rb | 79 +++++++++++++++ .../settings/simple_menu_items_controller.rb | 1 + .../menu_item_instances/_form.html.erb | 18 ++++ .../_settings_menu_item.json.jbuilder | 2 + .../menu_item_instances/edit.html.erb | 12 +++ .../menu_item_instances/index.html.erb | 93 ++++++++++++++++++ .../menu_item_instances/index.json.jbuilder | 1 + .../settings/menu_item_instances/new.html.erb | 17 ++++ .../menu_item_instances/show.html.erb | 96 +++++++++++++++++++ .../menu_item_instances/show.json.jbuilder | 1 + .../settings/processing_items/_form.html.erb | 2 + .../settings/simple_menu_items/show.html.erb | 41 ++++++++ 12 files changed, 363 insertions(+) create mode 100644 app/controllers/settings/menu_item_instances_controller.rb create mode 100644 app/views/settings/menu_item_instances/_form.html.erb create mode 100644 app/views/settings/menu_item_instances/_settings_menu_item.json.jbuilder create mode 100644 app/views/settings/menu_item_instances/edit.html.erb create mode 100644 app/views/settings/menu_item_instances/index.html.erb create mode 100644 app/views/settings/menu_item_instances/index.json.jbuilder create mode 100644 app/views/settings/menu_item_instances/new.html.erb create mode 100644 app/views/settings/menu_item_instances/show.html.erb create mode 100644 app/views/settings/menu_item_instances/show.json.jbuilder diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb new file mode 100644 index 00000000..fecc3cd7 --- /dev/null +++ b/app/controllers/settings/menu_item_instances_controller.rb @@ -0,0 +1,79 @@ +class Settings::MenuItemInstancesController < ApplicationController + before_action :set_settings_menu_item_instance, only: [:show, :edit, :update, :destroy] + before_action :set_settings_menu_item, only: [:index, :show, :edit, :new, :update] + + # GET /settings/menu_item_instances + # GET /settings/menu_item_instances.json + def index + @settings_menu_item_instances = MenuItemInstance.all + end + + # GET /settings/menu_item_instances/1 + # GET /settings/menu_item_instances/1.json + def show + end + + # GET /settings/menu_item_instances/new + def new + @settings_menu_item_instance = MenuItemInstance.new + end + + # GET /settings/menu_item_instances/1/edit + def edit + end + + # POST /settings/menu_item_instances + # POST /settings/menu_item_instances.json + def create + @settings_menu_item_instance = MenuItemInstance.new(settings_menu_item_instance_params) + + respond_to do |format| + if @settings_menu_item_instance.save + format.html { redirect_to settings_menu_item_instances_path, notice: 'Menu item instance was successfully created.' } + format.json { render :show, status: :created, location: @settings_menu_item_instance } + else + format.html { render :new } + format.json { render json: @settings_menu_item_instance.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/menu_item_instances/1 + # PATCH/PUT /settings/menu_item_instances/1.json + def update + respond_to do |format| + if @settings_menu_item_instance.update(settings_menu_item_instance_params) + format.html { redirect_to settings_menu_item_instance_path(@settings_menu_item_instance), notice: 'Menu item instance was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_menu_item_instance } + else + format.html { render :edit } + format.json { render json: @settings_menu_item_instance.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/menu_item_instances/1 + # DELETE /settings/menu_item_instances/1.json + def destroy + # @settings_menu_item_instance.destroy + respond_to do |format| + format.html { redirect_to settings_menu_item_instances_path, notice: 'Menu item instance was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_menu_item_instance + @set_settings_menu_item_instances = MenuItemInstance.find(params[:id]) + end + + def set_settings_menu_item + @item = MenuItem.find(params[:menu_item_id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_menu_item_instance_params + params.require(:menu_item_instance).permit(:name, :value) + end +end diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 2a391d8f..d2083e59 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -11,6 +11,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items/1.json def show @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) + @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) end # GET /settings/menu_items/new diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb new file mode 100644 index 00000000..b369a1d3 --- /dev/null +++ b/app/views/settings/menu_item_instances/_form.html.erb @@ -0,0 +1,18 @@ +<%= simple_form_for([:settings,:menu_item, @settings_menu_item_instance]) do |f| %> + <%= f.error_notification %> + +

+ <%= f.input :item_instance_code %> + <%= f.input :item_instance_name %> + <%= f.input :price %> + + + <%= f.input :is_on_promotion %> + <%= f.input :promotion_price %> + <%= f.input :is_available %> +
+ +
+ <%= f.button :submit %> +
+<% end %> diff --git a/app/views/settings/menu_item_instances/_settings_menu_item.json.jbuilder b/app/views/settings/menu_item_instances/_settings_menu_item.json.jbuilder new file mode 100644 index 00000000..781e4a34 --- /dev/null +++ b/app/views/settings/menu_item_instances/_settings_menu_item.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_menu_item, :id, :item_code, :name, :alt_name, :type, :menu_category_id, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by, :created_at, :updated_at +json.url settings_menu_item_url(settings_menu_item, format: :json) diff --git a/app/views/settings/menu_item_instances/edit.html.erb b/app/views/settings/menu_item_instances/edit.html.erb new file mode 100644 index 00000000..158b7c1c --- /dev/null +++ b/app/views/settings/menu_item_instances/edit.html.erb @@ -0,0 +1,12 @@ + + +
+
+ +
+ <%= render 'form', settings_set_menu_item: @settings_menu_item %> +
diff --git a/app/views/settings/menu_item_instances/index.html.erb b/app/views/settings/menu_item_instances/index.html.erb new file mode 100644 index 00000000..bfe6a99f --- /dev/null +++ b/app/views/settings/menu_item_instances/index.html.erb @@ -0,0 +1,93 @@ +
+
    +
  • Home
    • +
  • Menus Categories
    • + +
  • Menu Items
    • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %> + +
+
+
+
+

Menu Category

+ + + + + + + + + + + + + + + + + + + + + + +
MenuNameAlt nameOrder byParent
<%= @category.menu.name %><%= @category.name %><%= @category.alt_name %><%= @category.order_by %><%= @category.parent.name rescue "-" %><%= link_to 'Edit', edit_settings_menu_category_path(@category) %>
+
+
+
+
+
+

Menu Items + + <%= 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' %> + + +

+ + + + + + + + + + + + + + + + + <% @settings_menu_items.each do |settings_menu_item| %> + + + + + + + + + + <% if settings_menu_item.type == "SimpleMenuItem" %> + + + + <% else %> + + + + <% end %> + + <% end %> + +
Item codeNameAlt nameTypeParent ItemCreated byCreated at
<%= settings_menu_item.item_code %><%= settings_menu_item.name %><%= settings_menu_item.alt_name %><%= settings_menu_item.type %><%= settings_menu_item.parent.name rescue "-" %><%= settings_menu_item.created_by %><%=l settings_menu_item.created_at, :format => :short %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +
+ <%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %> diff --git a/app/views/settings/menu_item_instances/index.json.jbuilder b/app/views/settings/menu_item_instances/index.json.jbuilder new file mode 100644 index 00000000..9b0a47fa --- /dev/null +++ b/app/views/settings/menu_item_instances/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @settings_menu_items, partial: 'settings_menu_items/settings_menu_item', as: :settings_menu_item diff --git a/app/views/settings/menu_item_instances/new.html.erb b/app/views/settings/menu_item_instances/new.html.erb new file mode 100644 index 00000000..9fae5b34 --- /dev/null +++ b/app/views/settings/menu_item_instances/new.html.erb @@ -0,0 +1,17 @@ + + + +
+
+ +
+ <%= render 'form', settings_set_menu_instance: @settings_menu_item_instance %> +
diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb new file mode 100644 index 00000000..238fa038 --- /dev/null +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -0,0 +1,96 @@ + +
+ +
+ +
+
+

Menu Item

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Item codeNameAlt nameTypeMenu categoryMenu itemMin qtyMin selectable itemMax selectable itemCreated AtAction
<%= @settings_menu_item.item_code %><%= @settings_menu_item.name rescue "-" %><%= @settings_menu_item.alt_name %><%= @settings_menu_item.type %><%= @settings_menu_item.menu_category_id %><%= @settings_menu_item.menu_item_id %><%= @settings_menu_item.min_qty %><%= @settings_menu_item.min_selectable_item %><%= @settings_menu_item.max_selectable_item %><%=l @settings_menu_item.created_at, format: :short %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item) %>
+
+
+
+
+
+

Sub Menu Items

+ + + + + + + + + + + + + + + + + <% @sub_menu.each do |settings_menu_item| %> + + + + + + + + + + <% if settings_menu_item.type == "SimpleMenuItem" %> + + + + <% else %> + + + + <% end %> + + <% end %> + +
Item codeNameAlt nameTypeParent ItemCreated byCreated at
<%= settings_menu_item.item_code %><%= settings_menu_item.name %><%= settings_menu_item.alt_name %><%= settings_menu_item.type %><%= settings_menu_item.parent.name rescue "-" %><%= settings_menu_item.created_by %><%=l settings_menu_item.created_at, :format => :short %><%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %><%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %><%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>
+
+
+ <%= paginate @sub_menu, param_name: :page, :outer_window => 3 %> + diff --git a/app/views/settings/menu_item_instances/show.json.jbuilder b/app/views/settings/menu_item_instances/show.json.jbuilder new file mode 100644 index 00000000..4a11737c --- /dev/null +++ b/app/views/settings/menu_item_instances/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "settings_menu_items/settings_menu_item", settings_menu_item: @settings_menu_item diff --git a/app/views/settings/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb index 2038b0ea..60e493d8 100644 --- a/app/views/settings/processing_items/_form.html.erb +++ b/app/views/settings/processing_items/_form.html.erb @@ -29,7 +29,9 @@ <% end %> +
<%= f.button :submit, label: "Add Menu Items to Queue Station" %>
+
<% end %> diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index 97e12695..7f68c9aa 100644 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -93,4 +93,45 @@ <%= paginate @sub_menu, param_name: :page, :outer_window => 3 %> + +
+
+
+

Menu Item Instances + + <%= 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' %> + + +

+ + + + + + + + + + + + + + + + + <% @menu_item_instance.each do |settings_menu_item| %> + + + + + + + + + + <% end %> + +
Menu Item Iditem_instance_codeitem_attributespriceis_on_promotionpromotion_priceCreated at
<%= settings_menu_item.menu_item_id %><%= settings_menu_item.item_instance_code %><%= settings_menu_item.item_attributes %><%= settings_menu_item.price %><%= settings_menu_item.is_on_promotion %><%= settings_menu_item.promotion_price %><%=l settings_menu_item.created_at, :format => :short %>
+
+