diff --git a/app/controllers/settings/menu_item_options_controller.rb b/app/controllers/settings/menu_item_options_controller.rb index 91d0ecf7..4a3a44b7 100644 --- a/app/controllers/settings/menu_item_options_controller.rb +++ b/app/controllers/settings/menu_item_options_controller.rb @@ -4,7 +4,7 @@ class Settings::MenuItemOptionsController < ApplicationController # GET /settings/menu_item_options # GET /settings/menu_item_options.json def index - @settings_menu_item_options = Settings::MenuItemOption.all + @settings_menu_item_options = MenuItemOption.all end # GET /settings/menu_item_options/1 @@ -14,7 +14,7 @@ class Settings::MenuItemOptionsController < ApplicationController # GET /settings/menu_item_options/new def new - @settings_menu_item_option = Settings::MenuItemOption.new + @settings_menu_item_option = MenuItemOption.new end # GET /settings/menu_item_options/1/edit @@ -24,11 +24,11 @@ class Settings::MenuItemOptionsController < ApplicationController # POST /settings/menu_item_options # POST /settings/menu_item_options.json def create - @settings_menu_item_option = Settings::MenuItemOption.new(settings_menu_item_option_params) + @settings_menu_item_option = MenuItemOption.new(settings_menu_item_option_params) respond_to do |format| if @settings_menu_item_option.save - format.html { redirect_to @settings_menu_item_option, notice: 'Menu item option was successfully created.' } + format.html { redirect_to settings_menu_item_options_path, notice: 'Menu item option was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_item_option } else format.html { render :new } @@ -42,7 +42,7 @@ class Settings::MenuItemOptionsController < ApplicationController def update respond_to do |format| if @settings_menu_item_option.update(settings_menu_item_option_params) - format.html { redirect_to @settings_menu_item_option, notice: 'Menu item option was successfully updated.' } + format.html { redirect_to settings_menu_item_option_path(@settings_menu_item_option), notice: 'Menu item option was successfully updated.' } format.json { render :show, status: :ok, location: @settings_menu_item_option } else format.html { render :edit } @@ -56,7 +56,7 @@ class Settings::MenuItemOptionsController < ApplicationController def destroy @settings_menu_item_option.destroy respond_to do |format| - format.html { redirect_to settings_menu_item_options_url, notice: 'Menu item option was successfully destroyed.' } + format.html { redirect_to settings_menu_item_options_path, notice: 'Menu item option was successfully destroyed.' } format.json { head :no_content } end end @@ -64,11 +64,11 @@ class Settings::MenuItemOptionsController < ApplicationController private # Use callbacks to share common setup or constraints between actions. def set_settings_menu_item_option - @settings_menu_item_option = Settings::MenuItemOption.find(params[:id]) + @settings_menu_item_option = MenuItemOption.find(params[:id]) end # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_option_params - params.require(:settings_menu_item_option).permit(:name, :value) + params.require(:menu_item_option).permit(:name, :value) end end diff --git a/app/controllers/settings/menu_items_controller.rb b/app/controllers/settings/menu_items_controller.rb index b847eb32..6b405c11 100644 --- a/app/controllers/settings/menu_items_controller.rb +++ b/app/controllers/settings/menu_items_controller.rb @@ -28,7 +28,7 @@ class Settings::MenuItemsController < ApplicationController respond_to do |format| if @settings_menu_item.save - format.html { redirect_to @settings_menu_item, notice: 'Menu item was successfully created.' } + format.html { redirect_to settings_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::MenuItemsController < ApplicationController def update respond_to do |format| if @settings_menu_item.update(settings_menu_item_params) - format.html { redirect_to @settings_menu_item, notice: 'Menu item was successfully updated.' } + format.html { redirect_to settings_menu_item_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 } @@ -56,7 +56,7 @@ class Settings::MenuItemsController < ApplicationController def destroy @settings_menu_item.destroy respond_to do |format| - format.html { redirect_to settings_menu_items_url, notice: 'Menu item was successfully destroyed.' } + format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully destroyed.' } format.json { head :no_content } end end @@ -73,6 +73,6 @@ class Settings::MenuItemsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_params - params.require(:settings_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by) + params.require(:menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by) end end diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb index 9a8661e3..b10f31c9 100644 --- a/app/controllers/settings/menus_controller.rb +++ b/app/controllers/settings/menus_controller.rb @@ -69,6 +69,6 @@ class Settings::MenusController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_params - params.fetch(:settings_menu, {}) + params.require(:menu).permit(:name, :is_active, :valid_days, :valid_time_to, :valid_time_from) end end diff --git a/app/models/menu.rb b/app/models/menu.rb index f7c5f00b..44daca13 100644 --- a/app/models/menu.rb +++ b/app/models/menu.rb @@ -1,7 +1,7 @@ class Menu < ApplicationRecord has_many :menu_categories, dependent: :destroy - validates_presence_of :is_active, :valid_days, :valid_time_from, :valid_time_to + validates_presence_of :name, :is_active, :valid_days, :valid_time_from, :valid_time_to #Default Scope to pull the active version only default_scope { where(is_active: true).order("created_at desc") } diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index 185fffcd..f9f66f23 100644 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -1,4 +1,4 @@ - +
-
+ +
-

Menu Categories - - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_menu_category_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %> - - -

+

Menu Category

@@ -30,15 +26,37 @@ + + + + + + + + + +
<%= @settings_menu_category.menu %><%= @settings_menu_category.name rescue "-" %><%= @settings_menu_category.alt_name %><%= @settings_menu_category.order_by %><%=l @settings_menu_category.created_at, format: :short %><%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category) %>
+
+
- - <%= @settings_menu_category.menu %> - <%= @settings_menu_category.name rescue "-" %> - <%= @settings_menu_category.alt_name %> - <%= @settings_menu_category.order_by %> - <%=l @settings_menu_category.created_at, format: :short %> - <%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category) %> - +
+
+
+

Menu Items + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_category_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %> + + +

+ + + + + + + + +
Name
diff --git a/app/views/settings/menu_item_attributes/_form.html.erb b/app/views/settings/menu_item_attributes/_form.html.erb index 46f5a090..badcd9d3 100644 --- a/app/views/settings/menu_item_attributes/_form.html.erb +++ b/app/views/settings/menu_item_attributes/_form.html.erb @@ -1,4 +1,4 @@ -<%= simple_form_for(@settings_menu_item_attribute) do |f| %> +<%= simple_form_for([:settings, @settings_menu_item]) do |f| %> <%= f.error_notification %>
diff --git a/app/views/settings/menu_item_options/_form.html.erb b/app/views/settings/menu_item_options/_form.html.erb index 895a1152..a8365c65 100644 --- a/app/views/settings/menu_item_options/_form.html.erb +++ b/app/views/settings/menu_item_options/_form.html.erb @@ -1,9 +1,11 @@ -<%= simple_form_for(@settings_menu_item_option) do |f| %> + +<%= simple_form_for([:settings, @settings_menu_item_option]) do |f| %> <%= f.error_notification %>
<%= f.input :name %> <%= f.input :value %> +
diff --git a/app/views/settings/menu_item_options/edit.html.erb b/app/views/settings/menu_item_options/edit.html.erb index e6a1308b..487a55e7 100644 --- a/app/views/settings/menu_item_options/edit.html.erb +++ b/app/views/settings/menu_item_options/edit.html.erb @@ -1,6 +1,12 @@ -

Editing Settings Menu Item Option

-<%= render 'form', settings_menu_item_option: @settings_menu_item_option %> -<%= link_to 'Show', @settings_menu_item_option %> | -<%= link_to 'Back', settings_menu_item_options_path %> +
+
+ +
+ <%= render 'form', settings_menu_item_option: @settings_menu_item_option %> +
diff --git a/app/views/settings/menu_item_options/index.html.erb b/app/views/settings/menu_item_options/index.html.erb index 3099f526..e87343f8 100644 --- a/app/views/settings/menu_item_options/index.html.erb +++ b/app/views/settings/menu_item_options/index.html.erb @@ -1,29 +1,33 @@ -

<%= notice %>

-

Settings Menu Item Options

- - - - - - - - - - - <% @settings_menu_item_options.each do |settings_menu_item_option| %> +
+
    +
  • Home
    • +
  • Menu Item Option
    • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_item_option_path,:class => 'btn btn-primary btn-sm' %> + +
+
+
+
NameValue
+ - - - - - + + - <% end %> - -
<%= settings_menu_item_option.name %><%= settings_menu_item_option.value %><%= link_to 'Show', settings_menu_item_option %><%= link_to 'Edit', edit_settings_menu_item_option_path(settings_menu_item_option) %><%= link_to 'Destroy', settings_menu_item_option, method: :delete, data: { confirm: 'Are you sure?' } %>NameValue
+ -
+ + <% @settings_menu_item_options.each do |settings_menu_item_option| %> + + <%= link_to settings_menu_item_option.name, settings_menu_item_option_path(settings_menu_item_option) %> + <%= settings_menu_item_option.value %> + <%= link_to 'Edit', edit_settings_menu_item_option_path(settings_menu_item_option) %> + | <%= link_to 'Destroy', settings_menu_item_option_path(settings_menu_item_option), method: :delete, data: { confirm: 'Are you sure?' } %> -<%= link_to 'New Settings Menu Item Option', new_settings_menu_item_option_path %> + + <% end %> + + +
diff --git a/app/views/settings/menu_item_options/show.html.erb b/app/views/settings/menu_item_options/show.html.erb index 09c97490..fdcb9d09 100644 --- a/app/views/settings/menu_item_options/show.html.erb +++ b/app/views/settings/menu_item_options/show.html.erb @@ -1,14 +1,36 @@ -

<%= notice %>

-

- Name: - <%= @settings_menu_item_option.name %> -

+
+
    +
  • Home
    • +
  • Settings
    • +
  • Menu Item Option
    • + + +
+
+
+
+

Menu Item Option

+ + + + + + + + + -

- Value: - <%= @settings_menu_item_option.value %> -

+ + + + + + + + +
NameValueCreated AtAction
<%= @settings_menu_item_option.name %><%= @settings_menu_item_option.value rescue "-" %><%=l @settings_menu_item_option.created_at, format: :short %><%= link_to 'Edit', edit_settings_menu_item_option_path(@settings_menu_item_option, @settings_menu_item_option) %>
+
+
-<%= link_to 'Edit', edit_settings_menu_item_option_path(@settings_menu_item_option) %> | -<%= link_to 'Back', settings_menu_item_options_path %> +
diff --git a/app/views/settings/menu_items/_form.html.erb b/app/views/settings/menu_items/_form.html.erb index 8d56c39b..0222a59a 100644 --- a/app/views/settings/menu_items/_form.html.erb +++ b/app/views/settings/menu_items/_form.html.erb @@ -1,4 +1,4 @@ -<%= simple_form_for([:settings,@category, @settings_menu_item]) do |f| %> +<%= simple_form_for(@settings_menu_item) do |f| %> <%= f.error_notification %>
diff --git a/app/views/settings/menu_items/edit.html.erb b/app/views/settings/menu_items/edit.html.erb index 97c76046..40c675ef 100644 --- a/app/views/settings/menu_items/edit.html.erb +++ b/app/views/settings/menu_items/edit.html.erb @@ -1,6 +1,17 @@ -

Editing Settings Menu Item

+ + +
+
+ +
+ <%= render 'form', settings_menu_item: @settings_menu_item %> +
diff --git a/app/views/settings/menu_items/new.html.erb b/app/views/settings/menu_items/new.html.erb index db46d68c..bfc07ae3 100644 --- a/app/views/settings/menu_items/new.html.erb +++ b/app/views/settings/menu_items/new.html.erb @@ -1,5 +1,17 @@ -

New Settings Menu Item

+ + + +
+
+ +
+ <%= render 'form', settings_menu_item: @settings_menu_item %> +
diff --git a/app/views/settings/menu_items/show.html.erb b/app/views/settings/menu_items/show.html.erb index 0eedf257..66ae3e84 100644 --- a/app/views/settings/menu_items/show.html.erb +++ b/app/views/settings/menu_items/show.html.erb @@ -1,54 +1,52 @@ -

<%= notice %>

-

- Item code: - <%= @settings_menu_item.item_code %> -

+
+
    +
  • Home
    • +
  • Settings
    • +
  • Menu Item Option
    • + + +
+
-

- Name: - <%= @settings_menu_item.name %> -

+
+
+
+

Menu Item

+ + + + + + + + + + + + + + + + -

- Alt name: - <%= @settings_menu_item.alt_name %> -

+ + + + + + + + + + + + + + + +
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 %><%= @settings_menu_item.menu_item %><%= @settings_menu_item.menu_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) %>
+
+
-

- Type: - <%= @settings_menu_item.type %> -

- -

- Menu category: - <%= @settings_menu_item.menu_category %> -

- -

- Menu item: - <%= @settings_menu_item.menu_item %> -

- -

- Min qty: - <%= @settings_menu_item.min_qty %> -

- -

- Min selectable item: - <%= @settings_menu_item.min_selectable_item %> -

- -

- Max selectable item: - <%= @settings_menu_item.max_selectable_item %> -

- -

- Created by: - <%= @settings_menu_item.created_by %> -

- -<%= link_to 'Edit', edit_settings_menu_item_path(@settings_menu_item) %> | -<%= link_to 'Back', settings_menu_items_path %> +