diff --git a/app/controllers/api/restaurant/menu_item_options_controller.rb b/app/controllers/api/restaurant/menu_item_options_controller.rb index cc898add..16bd2f90 100644 --- a/app/controllers/api/restaurant/menu_item_options_controller.rb +++ b/app/controllers/api/restaurant/menu_item_options_controller.rb @@ -1,13 +1,8 @@ class Api::Restaurant::MenuItemOptionsController < Api::ApiController - #Description # Pull the default menu details and also other available (active) menus # Input Params - order_id def index @menu_options = MenuItemOption.all end - - - - end diff --git a/app/controllers/settings/menu_item_options_controller.rb b/app/controllers/settings/menu_item_options_controller.rb index 41679796..f74b0689 100644 --- a/app/controllers/settings/menu_item_options_controller.rb +++ b/app/controllers/settings/menu_item_options_controller.rb @@ -70,6 +70,6 @@ class Settings::MenuItemOptionsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_option_params - params.require(:menu_item_option).permit(:name, :value) + params.require(:menu_item_option).permit(:option_type, :name, :value) end end diff --git a/app/models/menu_item_option.rb b/app/models/menu_item_option.rb index fdf2d137..fffdf210 100644 --- a/app/models/menu_item_option.rb +++ b/app/models/menu_item_option.rb @@ -1,4 +1,3 @@ class MenuItemOption < ApplicationRecord validates_presence_of :name, :value - end diff --git a/app/views/api/restaurant/item_sets/index.json.jbuilder b/app/views/api/restaurant/item_sets/index.json.jbuilder index eb39022d..73ebeb12 100644 --- a/app/views/api/restaurant/item_sets/index.json.jbuilder +++ b/app/views/api/restaurant/item_sets/index.json.jbuilder @@ -1,4 +1,5 @@ json.array! @item_sets do |set| + json.id set.id json.name set.name json.alt_name set.alt_name json.min_selectable_qty set.min_selectable_qty diff --git a/app/views/api/restaurant/menu_item_attributes/index.json.jbuilder b/app/views/api/restaurant/menu_item_attributes/index.json.jbuilder index 0dc729eb..4a265fb6 100644 --- a/app/views/api/restaurant/menu_item_attributes/index.json.jbuilder +++ b/app/views/api/restaurant/menu_item_attributes/index.json.jbuilder @@ -1,4 +1,5 @@ json.array! @menu_attributes do |attribute| + json.id attribute.id json.type attribute.attribute_type json.name attribute.name json.value attribute.value diff --git a/app/views/api/restaurant/menu_item_options/index.json.jbuilder b/app/views/api/restaurant/menu_item_options/index.json.jbuilder index eae1c761..c7ce21aa 100644 --- a/app/views/api/restaurant/menu_item_options/index.json.jbuilder +++ b/app/views/api/restaurant/menu_item_options/index.json.jbuilder @@ -1,4 +1,6 @@ json.array! @menu_options do |option| + json.id option.id + json.type option.option_type json.name option.name json.value option.value end diff --git a/app/views/settings/menu_item_options/_form.html.erb b/app/views/settings/menu_item_options/_form.html.erb index a8365c65..6cc46cbd 100644 --- a/app/views/settings/menu_item_options/_form.html.erb +++ b/app/views/settings/menu_item_options/_form.html.erb @@ -3,6 +3,7 @@ <%= f.error_notification %>
+ <%= f.input :option_type %> <%= f.input :name %> <%= f.input :value %> diff --git a/app/views/settings/menu_item_options/index.html.erb b/app/views/settings/menu_item_options/index.html.erb index e87343f8..0818f57b 100644 --- a/app/views/settings/menu_item_options/index.html.erb +++ b/app/views/settings/menu_item_options/index.html.erb @@ -13,6 +13,7 @@ + @@ -21,6 +22,7 @@ <% @settings_menu_item_options.each do |settings_menu_item_option| %> +
Type Name Value
<%= settings_menu_item_option.option_type %> <%= 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) %> diff --git a/app/views/settings/menu_item_options/show.html.erb b/app/views/settings/menu_item_options/show.html.erb index 611f3165..413de12d 100644 --- a/app/views/settings/menu_item_options/show.html.erb +++ b/app/views/settings/menu_item_options/show.html.erb @@ -13,6 +13,7 @@ + @@ -22,6 +23,7 @@ + diff --git a/db/migrate/20170402083525_create_menu_item_options.rb b/db/migrate/20170402083525_create_menu_item_options.rb index 841b66a0..de39d55e 100644 --- a/db/migrate/20170402083525_create_menu_item_options.rb +++ b/db/migrate/20170402083525_create_menu_item_options.rb @@ -1,6 +1,7 @@ class CreateMenuItemOptions < ActiveRecord::Migration[5.1] def change create_table :menu_item_options do |t| + t.string :option_type t.string :name, :null => false t.string :value, :null => false diff --git a/db/seeds.rb b/db/seeds.rb index 5ab0d36d..2a9e422a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -114,18 +114,20 @@ customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contac tax_profiles = TaxProfile.create({id:1, name: "Commercial Tax", rate:5.0, order_by:2, created_by:"SYSTEM DEFAULT"}) service_charges = TaxProfile.create({id:2, name: "Service Charges", rate:10.0, order_by:1, created_by:"SYSTEM DEFAULT"}) -#Account for Menu Item Type (eg: Food, Beverage) -# food = Account.create({title: "Food", account_type: "0"}) -# beverage = Account.create({title: "Beverage", account_type: "1"}) - #Default menu -# menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"}) +menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"}) -menu_options = MenuItemOption.create([{name: "Less Spicy", value: "less_spicy"},{name: "Spicy", value: "spicy"},{name: "Super Spicy", value: "super_spicy"}]) -menu_options = MenuItemOption.create([{name: "Less Oil", value: "less_oil"},{name: "No MSG", value: "no_msg"},{name: "Less Sweet", value: "less_sweet"}]) +#Default Account +food = Account.create({title: "Food", account_type: "0"}) +beverage = Account.create({title: "Beverage", account_type: "1"}) +product = Account.create({title: "Product", account_type: "2"}) + +#Default Menu Options +menu_options = MenuItemOption.create([{option_type: "Spicy", name: "Less Spicy", value: "less_spicy"},{option_type: "Spicy", name: "Spicy", value: "spicy"},{option_type: "Spicy", name: "Super Spicy", value: "super_spicy"}]) +menu_options = MenuItemOption.create([{option_type: "Oil", name: "Less Oil", value: "less_oil"},{name: "No MSG", value: "no_msg"},{option_type: "Sweet", name: "Less Sweet", value: "less_sweet"}]) # #Default Menu Category -# menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base", alt_name: "Soup_base", order_by: 1,created_by: "SYSTEM DEFAULT"}) + menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base", alt_name: "Soup_base", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"}) # menu_category2 = MenuCategory.create({menu: menu, code:"C005", name: "Beef & Mutton", alt_name: "Beef_and_mutton", order_by: 2,created_by: "SYSTEM DEFAULT"}) # menu_category3 = MenuCategory.create({menu: menu, code:"C006", name: "Pork", alt_name: "Pork", order_by: 3,created_by: "SYSTEM DEFAULT"}) # menu_category4 = MenuCategory.create({menu: menu, code:"C006", name: "Chicken", alt_name: "Chicken", order_by: 1, menu_category_id: menu_category3.id, created_by: "SYSTEM DEFAULT"}) @@ -154,11 +156,6 @@ activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_pr # order_queue_station2 = OrderQueueStation.create({station_name: "Queue Station 2", is_active: true,printer_name: "drink_printer", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) # zone_order_queue_station = OrderQueueStation.create({station_name: "Zone 1 Queue Station 2", is_active: true, printer_name: "print_station", processing_items: JSON.generate(['01001','01002','01003','01004','02005','02006','02007','02008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) - -#Default Order Queue Process By Zone -# zone_queue_station = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone2}) - - #Create Adminstrator employee admin_employee = Employee.create({name: "Administrator", role: "administrator", password: "99999", emp_id:"999", created_by: "SYSTEM DEFAULT"}) admin_employee = Employee.create({name: "Waiter", role: "waiter", password: "11111", emp_id:"111", created_by: "SYSTEM DEFAULT"})
Type Name Value Created At
<%= @settings_menu_item_option.option_type %> <%= @settings_menu_item_option.name %> <%= @settings_menu_item_option.value rescue "-" %> <%=l @settings_menu_item_option.created_at, format: :short %>