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..97115e4e
--- /dev/null
+++ b/app/controllers/settings/menu_item_instances_controller.rb
@@ -0,0 +1,114 @@
+class Settings::MenuItemInstancesController < ApplicationController
+ before_action :set_settings_menu_item_instance, only: [:show, :edit, :update, :destroy]
+ before_action :set_settings_menu_item, only: [ :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
+ @category = MenuCategory.find(@item.menu_category_id)
+ end
+
+ # GET /settings/menu_item_instances/new
+ def new
+ @category = MenuCategory.find(@item.menu_category_id)
+ @settings_menu_item_instances = MenuItemInstance.new
+ end
+
+ # GET /settings/menu_item_instances/1/edit
+ def edit
+ @category = MenuCategory.find(@item.menu_category_id)
+ end
+
+ # POST /settings/menu_item_instances
+ # POST /settings/menu_item_instances.json
+ def create
+ @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_instances.save
+ @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes]
+ @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_instances.errors, status: :unprocessable_entity }
+ end
+ end
+ end
+
+ # PATCH/PUT /settings/menu_item_instances/1
+ # PATCH/PUT /settings/menu_item_instances/1.json
+ def update
+ puts "params[:menu_item_instance][:item_attributes]"
+ puts params[:menu_item_instance][:item_attributes]
+ 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_instances.update(settings_menu_item_instance_params)
+ @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
+ @settings_menu_item_instances.save
+ 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_instances.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_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_category_simple_menu_item_path(category,catID), 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
+ @settings_menu_item_instances = MenuItemInstance.find(params[:id])
+ end
+
+ def set_settings_menu_item
+ 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(:item_instance_code, :item_instance_name, :price, :item_attributes, :is_on_promotion, :promotion_price, :is_available,:menu_category_id,:menu_item_id)
+ end
+end
diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb
index ec85e56a..46fcb54d 100644
--- a/app/controllers/settings/order_queue_stations_controller.rb
+++ b/app/controllers/settings/order_queue_stations_controller.rb
@@ -1,10 +1,10 @@
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
def index
- @settings_order_queue_stations = OrderQueueStation.all
+ @settings_order_queue_stations = OrderQueueStation.all.active
end
# GET /settings/order_queue_stations/1
@@ -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 }
@@ -40,6 +40,7 @@ class Settings::OrderQueueStationsController < ApplicationController
# PATCH/PUT /settings/order_queue_stations/1
# PATCH/PUT /settings/order_queue_stations/1.json
def update
+ params[:order_queue_station][:processing_items] = params[:order_queue_station][:processing_items].split(/,/).inspect
respond_to do |format|
if @settings_order_queue_station.update(settings_order_queue_station_params)
format.html { redirect_to settings_order_queue_station_path(@settings_order_queue_station), notice: 'Order queue station was successfully updated.' }
diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb
index b488ac6f..7ef6cc18 100644
--- a/app/controllers/settings/set_menu_items_controller.rb
+++ b/app/controllers/settings/set_menu_items_controller.rb
@@ -10,6 +10,8 @@ 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)
+ @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/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb
index 6b3c4bb4..08186297 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
@@ -10,6 +10,8 @@ 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)
+ @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
end
# GET /settings/menu_items/new
@@ -76,6 +78,6 @@ class Settings::SimpleMenuItemsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def settings_menu_item_params
- params.require(:simple_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(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
end
end
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/models/menu_item_attribute.rb b/app/models/menu_item_attribute.rb
index ebaa060e..a2fd0d1c 100644
--- a/app/models/menu_item_attribute.rb
+++ b/app/models/menu_item_attribute.rb
@@ -1,4 +1,6 @@
class MenuItemAttribute < ApplicationRecord
validates_presence_of :attribute_type, :name, :value
-
+ def self.collection
+ MenuItemAttribute.select("id, name").map { |e| [e.name, e.id] }
+ end
end
diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb
index 21885b8b..21f2ba37 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) %> |
@@ -69,16 +69,20 @@
<%= 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) %> |
<%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> |
+ <% else %>
+ <%= 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?' } %> |
+ <% end %>
<% end %>
-
\ No newline at end of file
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 @@
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/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/menus/show.html.erb b/app/views/settings/menus/show.html.erb
index 28efe8af..b318be63 100644
--- a/app/views/settings/menus/show.html.erb
+++ b/app/views/settings/menus/show.html.erb
@@ -32,7 +32,7 @@
<%= @settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %> |
<%= @settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %> |
<%= @settings_menu.created_by %> |
- <%=l @settings_menu.created_at, format: :short %> |
+ <%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> |
<%= link_to 'Edit', edit_settings_menu_path(@settings_menu) %> |
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 %>
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/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..8d529a43 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' %>
+
+
+
@@ -65,11 +71,17 @@
| <%= 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") %> |
- <%= 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?' } %> |
+ <% 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 %>
diff --git a/app/views/settings/set_menu_items/new.html.erb b/app/views/settings/set_menu_items/new.html.erb
index 7b234827..c7d277bf 100644
--- a/app/views/settings/set_menu_items/new.html.erb
+++ b/app/views/settings/set_menu_items/new.html.erb
@@ -1,8 +1,6 @@
+<%= render 'form', settings_menu_item: @settings_menu_item %> -->
@@ -13,5 +11,5 @@
New
- <%= 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/show.html.erb b/app/views/settings/set_menu_items/show.html.erb
index 271039ef..2365c310 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
@@ -36,17 +35,107 @@
<%= @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) %> |
+ <%= @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 %>
+
+
+
+
Sub Menu Items
+
+
+
+ | Item code |
+ Name |
+ Alt name |
+ Type |
+ Parent Item |
+ Created by |
+ Created at |
+ |
+
+
+
+
+ <% @sub_menu.each do |settings_menu_item| %>
+
+ | <%= 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 %> |
+ <%= 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 ) %> |
+ <%= 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 %>
+
+
+
+
+
+
+
Menu Item Instances
+
+ <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_set_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>
+
+
+
+
+
+
+
+ | item_instance_code |
+ item_attributes |
+ price |
+ is_on_promotion |
+ promotion_price |
+ Created at |
+
+ |
+
+
+
+
+ <% @menu_item_instance.each do |settings_menu_item| %>
+
+
+ | <%= 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") %> |
+ <%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ) %> |
+ <%= link_to 'Edit', edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item) %> |
+ <%= link_to 'Destroy', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> |
+
+ <% end %>
+
+
+
+
<%= 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 ) %> |
<%= 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 %>
diff --git a/app/views/settings/simple_menu_items/new.html.erb b/app/views/settings/simple_menu_items/new.html.erb
index 2f3cb6a4..5781850d 100644
--- a/app/views/settings/simple_menu_items/new.html.erb
+++ b/app/views/settings/simple_menu_items/new.html.erb
@@ -1,8 +1,6 @@
+<%= render 'form', settings_menu_item: @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 60e7c596..6e93d3cc 100644
--- a/app/views/settings/simple_menu_items/show.html.erb
+++ b/app/views/settings/simple_menu_items/show.html.erb
@@ -3,13 +3,12 @@
Menu Item
@@ -41,12 +40,103 @@
<%= @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 %>
+
+
+
+
Sub Menu Items
+
+
+
+ | Item code |
+ Name |
+ Alt name |
+ Type |
+ Parent Item |
+ Created by |
+ Created at |
+ |
+
+
+
+
+ <% @sub_menu.each do |settings_menu_item| %>
+
+ | <%= 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 %> |
+ <%= 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 ) %> |
+ <%= 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 %>
+
+
+
+
+
+
+
Menu Item Instances
+
+ <%= 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' %>
+
+
+
+
+
+
+
+ | item_instance_code |
+ item_attributes |
+ price |
+ is_on_promotion |
+ promotion_price |
+ Created at |
+
+ |
+
+
+
+
+ <% @menu_item_instance.each do |settings_menu_item| %>
+
+
+ | <%= 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") %> |
+
+ <%= 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?' } %> |
+
+ <% end %>
+
+
+
+