diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb index fecc3cd7..775be176 100644 --- a/app/controllers/settings/menu_item_instances_controller.rb +++ b/app/controllers/settings/menu_item_instances_controller.rb @@ -1,6 +1,6 @@ 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] + before_action :set_settings_menu_item, only: [ :show, :edit, :new, :update] # GET /settings/menu_item_instances # GET /settings/menu_item_instances.json @@ -11,29 +11,51 @@ class Settings::MenuItemInstancesController < ApplicationController # GET /settings/menu_item_instances/1 # GET /settings/menu_item_instances/1.json def show + @category = MenuCategory.find(@item.menu_category_id) end # GET /settings/menu_item_instances/new def new - @settings_menu_item_instance = MenuItemInstance.new + if params[:simple_menu_item_id] + @aa = MenuItem.find(params[:simple_menu_item_id]) + else + @aa = MenuItem.find(params[:set_menu_item_id]) + end + @category = MenuCategory.find(@item.menu_category_id) + @settings_menu_item_instances = MenuItemInstance.new end # GET /settings/menu_item_instances/1/edit def edit + if params[:simple_menu_item_id] + @aa = MenuItem.find(params[:simple_menu_item_id]) + else + @aa = MenuItem.find(params[:set_menu_item_id]) + end + @category = MenuCategory.find(@item.menu_category_id) 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) + @settings_menu_item_instances = MenuItemInstance.new(settings_menu_item_instance_params) + if params[:simple_menu_item_id] + @settings_menu_item_instances.menu_item_id = params[:simple_menu_item_id] + catID = MenuItem.find(params[:simple_menu_item_id]) + else + @settings_menu_item_instances.menu_item_id = params[:set_menu_item_id] + catID = MenuItem.find(params[:set_menu_item_id]) + end + + category = MenuCategory.find(catID.menu_category_id) 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 } + if @settings_menu_item_instances.save + format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully created.' } + format.json { render :show, status: :created, location: @settings_menu_item_instances } else format.html { render :new } - format.json { render json: @settings_menu_item_instance.errors, status: :unprocessable_entity } + format.json { render json: @settings_menu_item_instances.errors, status: :unprocessable_entity } end end end @@ -41,13 +63,19 @@ class Settings::MenuItemInstancesController < ApplicationController # PATCH/PUT /settings/menu_item_instances/1 # PATCH/PUT /settings/menu_item_instances/1.json def update + if params[:simple_menu_item_id] + catID = MenuItem.find(params[:simple_menu_item_id]) + else + catID = MenuItem.find(params[:set_menu_item_id]) + end + category = MenuCategory.find(catID.menu_category_id) 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 } + if @settings_menu_item_instances.update(settings_menu_item_instance_params) + format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_menu_item_instances } else format.html { render :edit } - format.json { render json: @settings_menu_item_instance.errors, status: :unprocessable_entity } + format.json { render json: @settings_menu_item_instances.errors, status: :unprocessable_entity } end end end @@ -55,9 +83,15 @@ class Settings::MenuItemInstancesController < ApplicationController # DELETE /settings/menu_item_instances/1 # DELETE /settings/menu_item_instances/1.json def destroy - # @settings_menu_item_instance.destroy + @settings_menu_item_instances.destroy + if params[:simple_menu_item_id] + catID = MenuItem.find(params[:simple_menu_item_id]) + else + catID = MenuItem.find(params[:set_menu_item_id]) + end + category = MenuCategory.find(catID.menu_category_id) respond_to do |format| - format.html { redirect_to settings_menu_item_instances_path, notice: 'Menu item instance was successfully destroyed.' } + format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully destroyed.' } format.json { head :no_content } end end @@ -65,15 +99,19 @@ class Settings::MenuItemInstancesController < ApplicationController 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]) + @settings_menu_item_instances = MenuItemInstance.find(params[:id]) end def set_settings_menu_item - @item = MenuItem.find(params[:menu_item_id]) + if params[:simple_menu_item_id] + @item = MenuItem.find(params[:simple_menu_item_id]) + else + @item = MenuItem.find(params[:set_menu_item_id]) + end 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) + params.require(:menu_item_instance).permit(:item_instance_code, :item_instance_name, :price, :is_on_promotion, :promotion_price, :is_available,:menu_category_id,:menu_item_id) end end diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index cc5e89e8..7ef6cc18 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -11,6 +11,7 @@ class Settings::SetMenuItemsController < 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_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index dcd7b45d..88430b51 100644 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -28,7 +28,7 @@ <%= @settings_menu_category.name rescue "-" %> <%= @settings_menu_category.alt_name %> <%= @settings_menu_category.order_by %> - <%=l @settings_menu_category.created_at, format: :short %> + <%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category) %> @@ -37,6 +37,7 @@
+<% if @settings_menu_category.menu_items.count > 0 %>

Menu Items @@ -69,7 +70,7 @@ <%= settings_menu_item.type %> <%= settings_menu_item.parent.name rescue "-" %> <%= settings_menu_item.created_by %> - <%=l settings_menu_item.created_at, :format => :short %> + <%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <% if settings_menu_item.type == "SimpleMenuItem" %> <%= 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) %> @@ -85,5 +86,5 @@

- +<% end %>
\ No newline at end of file diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb index b369a1d3..e2751fee 100644 --- a/app/views/settings/menu_item_instances/_form.html.erb +++ b/app/views/settings/menu_item_instances/_form.html.erb @@ -1,4 +1,4 @@ -<%= simple_form_for([:settings,:menu_item, @settings_menu_item_instance]) do |f| %> +<%= simple_form_for([:settings, @item, @settings_menu_item_instances]) do |f| %> <%= f.error_notification %>
diff --git a/app/views/settings/menu_item_instances/edit.html.erb b/app/views/settings/menu_item_instances/edit.html.erb index 158b7c1c..887806cb 100644 --- a/app/views/settings/menu_item_instances/edit.html.erb +++ b/app/views/settings/menu_item_instances/edit.html.erb @@ -4,9 +4,11 @@
- <%= render 'form', settings_set_menu_item: @settings_menu_item %> + <%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances %>
diff --git a/app/views/settings/menu_item_instances/new.html.erb b/app/views/settings/menu_item_instances/new.html.erb index 9fae5b34..b4de46cf 100644 --- a/app/views/settings/menu_item_instances/new.html.erb +++ b/app/views/settings/menu_item_instances/new.html.erb @@ -1,17 +1,16 @@ +<%= render 'form', settings_menu_item: @settings_menu_item %>-->
- <%= render 'form', settings_set_menu_instance: @settings_menu_item_instance %> + <%= render 'form', settings_simple_menu_item_menu_item_instances: @settings_menu_item_instances %>
diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb index 238fa038..44c84be4 100644 --- a/app/views/settings/menu_item_instances/show.html.erb +++ b/app/views/settings/menu_item_instances/show.html.erb @@ -1,9 +1,10 @@
@@ -11,86 +12,37 @@
-

Menu Item

+

Menu Item Instance

- + - - - - - - - + + + + - - - - - - - - - - - - + + + + + + + + <% if params[:simple_menu_item_id] %> + + <% else %> + + <% end %>
Item codeItem Instance code NameAlt nameTypeMenu categoryMenu itemMin qtyMin selectable itemMax selectable itemPriceOn PromotionPromotion PriceAvailable Created 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) %><%= @settings_menu_item_instances.item_instance_code %><%= @settings_menu_item_instances.item_instance_name rescue "-" %><%= @settings_menu_item_instances.price %><%= @settings_menu_item_instances.is_on_promotion %><%= @settings_menu_item_instances.promotion_price %><%= @settings_menu_item_instances.is_available %><%=l @settings_menu_item_instances.created_at, format: :short %><%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %><%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %>
-
-
-
-

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/set_menu_items/index.html.erb b/app/views/settings/set_menu_items/index.html.erb index bfe6a99f..8d529a43 100644 --- a/app/views/settings/set_menu_items/index.html.erb +++ b/app/views/settings/set_menu_items/index.html.erb @@ -71,7 +71,7 @@ <%= settings_menu_item.type %> <%= settings_menu_item.parent.name rescue "-" %> <%= settings_menu_item.created_by %> - <%=l settings_menu_item.created_at, :format => :short %> + <%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <% if settings_menu_item.type == "SimpleMenuItem" %> <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %> diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb index 238fa038..c0aeca31 100644 --- a/app/views/settings/set_menu_items/show.html.erb +++ b/app/views/settings/set_menu_items/show.html.erb @@ -40,13 +40,14 @@ <%= @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 %> + <%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item) %> +<% if @sub_menu.count > 0 %>
@@ -75,7 +76,7 @@ <%= settings_menu_item.type %> <%= settings_menu_item.parent.name rescue "-" %> <%= settings_menu_item.created_by %> - <%=l settings_menu_item.created_at, :format => :short %> + <%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <% if settings_menu_item.type == "SimpleMenuItem" %> <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %> @@ -93,4 +94,45 @@
<%= paginate @sub_menu, param_name: :page, :outer_window => 3 %> +<% end %> +
+
+
+

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 %> + +
item_instance_codeitem_attributespriceis_on_promotionpromotion_priceCreated at
<%= 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 %><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %>
+
+
diff --git a/app/views/settings/simple_menu_items/index.html.erb b/app/views/settings/simple_menu_items/index.html.erb index 4a9efb75..b82af610 100644 --- a/app/views/settings/simple_menu_items/index.html.erb +++ b/app/views/settings/simple_menu_items/index.html.erb @@ -70,7 +70,7 @@ <%= settings_menu_item.type %> <%= settings_menu_item.parent.name rescue "-" %> <%= settings_menu_item.created_by %> - <%=l settings_menu_item.created_at, :format => :short %> + <%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <% if settings_menu_item.type == "SimpleMenuItem" %> <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %> diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb index 7f68c9aa..878cd2e5 100644 --- a/app/views/settings/simple_menu_items/show.html.erb +++ b/app/views/settings/simple_menu_items/show.html.erb @@ -40,13 +40,14 @@ <%= @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 %> + <%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item) %> +<% if @sub_menu.count > 0 %>
@@ -75,7 +76,7 @@ <%= settings_menu_item.type %> <%= settings_menu_item.parent.name rescue "-" %> <%= settings_menu_item.created_by %> - <%=l settings_menu_item.created_at, :format => :short %> + <%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> <% if settings_menu_item.type == "SimpleMenuItem" %> <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %> @@ -93,20 +94,20 @@
<%= paginate @sub_menu, param_name: :page, :outer_window => 3 %> - +<% end %>

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' %> + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>

- + @@ -121,13 +122,17 @@ <% @menu_item_instance.each do |settings_menu_item| %> - + - + + + + + <% end %> diff --git a/config/routes.rb b/config/routes.rb index ed2cdab0..baa2e6e4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -105,12 +105,15 @@ Rails.application.routes.draw do resources :menu_categories do #menu_items - #resources :menu_items + # resources :menu_items resources :simple_menu_items resources :set_menu_items end - resources :menu_items do + resources :simple_menu_items do + resources :menu_item_instances + end + resources :set_menu_items do resources :menu_item_instances end #menu_item_attributes
Menu Item Id item_instance_code item_attributes price
<%= 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 %><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ) %><%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item) %><%= link_to 'Destroy', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %>