From 9321be611beb51e2e3516b9842b8713faf68e924 Mon Sep 17 00:00:00 2001 From: Nweni Date: Thu, 20 Apr 2017 18:15:48 +0630 Subject: [PATCH] menu categories --- .../settings/menu_categories_controller.rb | 6 +- app/controllers/settings/menus_controller.rb | 6 +- app/models/menu.rb | 2 +- .../settings/menu_categories/index.html.erb | 5 +- .../settings/menu_categories/show.html.erb | 67 ++++++++++++------- app/views/settings/menus/_form.html.erb | 7 +- app/views/settings/menus/index.html.erb | 6 +- app/views/settings/menus/new.html.erb | 14 ++-- 8 files changed, 71 insertions(+), 42 deletions(-) diff --git a/app/controllers/settings/menu_categories_controller.rb b/app/controllers/settings/menu_categories_controller.rb index f76c86ed..daa76d62 100644 --- a/app/controllers/settings/menu_categories_controller.rb +++ b/app/controllers/settings/menu_categories_controller.rb @@ -32,7 +32,7 @@ class Settings::MenuCategoriesController < ApplicationController respond_to do |format| if @settings_menu_category.save - format.html { redirect_to @settings_menu_category, notice: 'Menu category was successfully created.' } + format.html { redirect_to settings_menu_categories_path, notice: 'Menu category was successfully created.' } format.json { render :show, status: :created, location: @settings_menu_category } else if (@settings_menu_category.errors) @@ -51,7 +51,7 @@ class Settings::MenuCategoriesController < ApplicationController def update respond_to do |format| if @settings_menu_category.update(settings_menu_category_params) - format.html { redirect_to @settings_menu_category, notice: 'Menu category was successfully updated.' } + format.html { redirect_to settings_menu_category_path(@settings_menu_category), notice: 'Menu category was successfully updated.' } format.json { render :show, status: :ok, location: @settings_menu_category } else format.html { render :edit } @@ -65,7 +65,7 @@ class Settings::MenuCategoriesController < ApplicationController def destroy @settings_menu_category.destroy respond_to do |format| - format.html { redirect_to settings_menu_categories_url, notice: 'Menu category was successfully destroyed.' } + format.html { redirect_to settings_menu_categories_path, notice: 'Menu category was successfully destroyed.' } format.json { head :no_content } end end diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb index d757cde5..9a8661e3 100644 --- a/app/controllers/settings/menus_controller.rb +++ b/app/controllers/settings/menus_controller.rb @@ -28,7 +28,7 @@ class Settings::MenusController < ApplicationController respond_to do |format| if @settings_menu.save - format.html { redirect_to @settings_menu, notice: 'Menu was successfully created.' } + format.html { redirect_to settings_menus_path, notice: 'Menu was successfully created.' } format.json { render :show, status: :created, location: @settings_menu } else format.html { render :new } @@ -42,7 +42,7 @@ class Settings::MenusController < ApplicationController def update respond_to do |format| if @settings_menu.update(settings_menu_params) - format.html { redirect_to @settings_menu, notice: 'Menu was successfully updated.' } + format.html { redirect_to settings_menu_path(@settings_menu), notice: 'Menu was successfully updated.' } format.json { render :show, status: :ok, location: @settings_menu } else format.html { render :edit } @@ -56,7 +56,7 @@ class Settings::MenusController < ApplicationController def destroy @settings_menu.destroy respond_to do |format| - format.html { redirect_to settings_menus_url, notice: 'Menu was successfully destroyed.' } + format.html { redirect_to settings_menus_path, notice: 'Menu was successfully destroyed.' } format.json { head :no_content } end end diff --git a/app/models/menu.rb b/app/models/menu.rb index 4f1608ad..f7c5f00b 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 :name,:is_active, :valid_days, :valid_time_from, :valid_time_to + validates_presence_of :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/index.html.erb b/app/views/settings/menu_categories/index.html.erb index bd648938..a48606d2 100644 --- a/app/views/settings/menu_categories/index.html.erb +++ b/app/views/settings/menu_categories/index.html.erb @@ -28,11 +28,12 @@ <% @settings_menu_categories.each do |settings_menu_category| %> <%= settings_menu_category.menu rescue '' %> - <%= settings_menu_category.name rescue ''%> + <%= link_to settings_menu_category.name, settings_menu_category_path(settings_menu_category) %> + <%= settings_menu_category.alt_name rescue ''%> <%= settings_menu_category.order_by rescue ''%> <%= settings_menu_category.parent.name rescue ''%> - <%= link_to 'Edit', edit_settings_menu_category_path(settings_menu_category) %> | <%= link_to 'Destroy', method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to 'Edit', edit_settings_menu_category_path(settings_menu_category) %> | <%= link_to 'Destroy', settings_menu_categories_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index 38474543..185fffcd 100644 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -1,29 +1,46 @@ -

<%= notice %>

+ +
+ +
+
+
+
+

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: - <%= @settings_menu_category.menu %> -

+

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

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

+ -

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

+ + + + + + + + -

- Order by: - <%= @settings_menu_category.order_by %> -

- -

- Menu category: - <%= @settings_menu_category.menu_category rescue '' %> -

- -<%= link_to 'Edit', edit_settings_menu_category_path(@settings_menu_category) %> | -<%= link_to 'Back', settings_menu_categories_path %> + +
MenuNameAlt nameOrder byCreated AtAction
<%= @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) %>
+
+
diff --git a/app/views/settings/menus/_form.html.erb b/app/views/settings/menus/_form.html.erb index 6fdef553..2e6e1ecb 100644 --- a/app/views/settings/menus/_form.html.erb +++ b/app/views/settings/menus/_form.html.erb @@ -1,7 +1,12 @@ -<%= simple_form_for([:settings, @settings_menu]) do |f| %> +<%= simple_form_for([:settings,@settings_menu]) do |f| %> <%= f.error_notification %>
+ <%= f.input :name %> + <%= f.input :is_active %> + <%= f.input :valid_days %> + <%= f.input :valid_time_to %> + <%= f.input :valid_time_from %>
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb index 626ed0c0..0f6d5943 100644 --- a/app/views/settings/menus/index.html.erb +++ b/app/views/settings/menus/index.html.erb @@ -1,8 +1,8 @@ + +
  • Home
    • -
  • Settings
    • -
  • Menu
    • <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_path,:class => 'btn btn-primary btn-sm' %> @@ -12,7 +12,7 @@
    - +
    diff --git a/app/views/settings/menus/new.html.erb b/app/views/settings/menus/new.html.erb index 9972fad1..d8315ca5 100644 --- a/app/views/settings/menus/new.html.erb +++ b/app/views/settings/menus/new.html.erb @@ -1,5 +1,11 @@ -

    New Settings Menu

    -<%= render 'form', settings_menu: @settings_menu %> - -<%= link_to 'Back', settings_menus_path %> +
    +
    + +
    + <%= render 'form', settings_menu: @settings_menu %> +
    Name