diff --git a/app/controllers/settings/menu_categories_controller.rb b/app/controllers/settings/menu_categories_controller.rb index daa76d62..d7f373aa 100644 --- a/app/controllers/settings/menu_categories_controller.rb +++ b/app/controllers/settings/menu_categories_controller.rb @@ -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 } diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb index b10f31c9..e0ecde30 100644 --- a/app/controllers/settings/menus_controller.rb +++ b/app/controllers/settings/menus_controller.rb @@ -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 } diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index 1f227246..eb9ea830 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -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 } diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index c9114330..e3ab6714 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -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 diff --git a/app/models/menu.rb b/app/models/menu.rb index 44daca13..ac9ea4d3 100644 --- a/app/models/menu.rb +++ b/app/models/menu.rb @@ -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") } diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb index 4474ae60..495addcc 100644 --- a/app/views/settings/menu_categories/index.html.erb +++ b/app/views/settings/menu_categories/index.html.erb @@ -40,3 +40,4 @@ + <%= paginate @settings_menu_categories, param_name: :page, :outer_window => 3 %> diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index f151a356..21885b8b 100644 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -1,15 +1,12 @@ -
-
- -
+

Menu Category

@@ -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' %> - - - + + + + + + + + - + <% settings_menu_items = @settings_menu_category.menu_items %> + <% settings_menu_items.each do |settings_menu_item| %> + + + + + + + + + + + + + <% end %>
Item code NameAlt 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(@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?' } %>
+
-
+ + \ No newline at end of file diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb index 47c031ca..1f1bf994 100644 --- a/app/views/settings/menus/index.html.erb +++ b/app/views/settings/menus/index.html.erb @@ -2,9 +2,8 @@
+ <%= paginate @settings_menus, param_name: :page, :outer_window => 3 %> diff --git a/app/views/settings/menus/show.html.erb b/app/views/settings/menus/show.html.erb index 34b2c3c0..28efe8af 100644 --- a/app/views/settings/menus/show.html.erb +++ b/app/views/settings/menus/show.html.erb @@ -1,8 +1,8 @@
@@ -62,13 +62,13 @@ - <% @settings_menu.menu_categories.each do |category|%> + <% @settings_menu_categories.each do |category|%> <%= link_to category.name, settings_menu_category_path(category) %> <%= category.children.count rescue "-" %> <%= category.menu_items.count %> <%= category.order_by %> - <%=l category.created_at, format: :short %> + <%= category.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu, category) %> <% end %> @@ -76,3 +76,4 @@
+<%= paginate @settings_menu_categories, param_name: :page, :outer_window => 3 %> diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb index 836f3f61..d187847a 100644 --- a/app/views/settings/simple_menu_items/_form.html.erb +++ b/app/views/settings/simple_menu_items/_form.html.erb @@ -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 %>
diff --git a/app/views/settings/simple_menu_items/edit.html.erb b/app/views/settings/simple_menu_items/edit.html.erb index 40c675ef..5d4d9b8e 100644 --- a/app/views/settings/simple_menu_items/edit.html.erb +++ b/app/views/settings/simple_menu_items/edit.html.erb @@ -1,17 +1,14 @@ +<%= render 'form', settings_menu_item: @settings_menu_item %>-->
- <%= render 'form', settings_menu_item: @settings_menu_item %> + <%= render 'form', settings_simple_menu_item: @settings_menu_item %>
diff --git a/app/views/settings/simple_menu_items/index.html.erb b/app/views/settings/simple_menu_items/index.html.erb index 89fc850f..6de3d619 100644 --- a/app/views/settings/simple_menu_items/index.html.erb +++ b/app/views/settings/simple_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_simple_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_items.count %>

    @@ -67,9 +73,9 @@ - - - + + + <% end %> diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index 66ae3e84..f69c83d4 100644 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_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?' } %>
    <%= @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_simple_menu_item_path(@category, @settings_menu_item) %>