diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 2b42e1fd..71ad42c8 100644 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -1,5 +1,4 @@ -class MenuCategory < ApplicationRecord - +class MenuCategory < ApplicationRecord before_create :generate_menu_category_code belongs_to :menu @@ -7,7 +6,7 @@ class MenuCategory < ApplicationRecord belongs_to :parent, :class_name => "MenuCategory", foreign_key: "menu_category_id", optional: true has_many :menu_items - validates_presence_of :name, :menu, :code, :order_by + validates_presence_of :name, :menu, :order_by default_scope { order('order_by asc') } @@ -38,7 +37,7 @@ class MenuCategory < ApplicationRecord private - def generate_menu_category_code - self.code = SeedGenerator.generate_code(self.class.name, "C") + def generate_menu_category_code + self.code = SeedGenerator.generate_code(self.class.name, "C") end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 9ab8822e..1f1afbe4 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -8,7 +8,7 @@ class MenuItem < ApplicationRecord has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" belongs_to :account - validates_presence_of :item_code, :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item + validates_presence_of :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item default_scope { order('item_code asc') } diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 21b8b225..a88cd8d7 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -61,8 +61,7 @@ class SeedGenerator < ApplicationRecord end padding_len = 5 - prefix.length - next_code = prefix +"-"+ seed.current.to_s.to_s.rjust((4-prefix.length)+1,'0') + next_code = prefix + seed.current.to_s.to_s.rjust((4-prefix.length)+1,'0') return next_code - end end diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake index 273e66a3..cbf1b415 100644 --- a/lib/tasks/menu_osaka.rake +++ b/lib/tasks/menu_osaka.rake @@ -13,37 +13,37 @@ beverage = Account.create({title: "Beverage", account_type: "1"}) # Gyoza menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoza", order_by: 1,created_by: "SYSTEM DEFAULT"}) #Gyoza 6Pcs - menu_category1_menu_item5 = SimpleMenuItem.create({ name: "Gyoza 6Pcs", alt_name: "Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) + menu_category1_menu_item5 = SimpleMenuItem.create({name: "Gyoza 6Pcs", alt_name: "Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item5, price:2500.0, is_on_promotion:false}]) #Gyoza 12 Pcs - menu_category1_menu_item6 = SimpleMenuItem.create({ name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork",menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken",menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + menu_category1_menu_item6 = SimpleMenuItem.create({name: "Gyoza 12 Pcs", alt_name: "Gyoza 12 Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Chicken", menu_item: menu_category1_menu_item6, price:5000.0, is_on_promotion:false}]) # Cheese Gyoza 6pcs - menu_category1_menu_item2 = SimpleMenuItem.create({ name: "Cheese Gyoza 6pcs", alt_name: "Cheese Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item2, price:5000.0, is_on_promotion:false}]) + menu_category1_menu_item2 = SimpleMenuItem.create({name: "Cheese Gyoza 6pcs", alt_name: "Cheese Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item2, price:5000.0, is_on_promotion:false}]) # Spicy Mayonnaise Gyoza 6pcs - menu_category1_menu_item4 = SimpleMenuItem.create({ name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) + menu_category1_menu_item4 = SimpleMenuItem.create({name: "Spicy Mayonnaise Gyoza 6pcs", alt_name: "Spicy Mayonnaise Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item4, price:4000.0, is_on_promotion:false}]) #Garlic Gyoza 6pcs - menu_category1_menu_item26 = SimpleMenuItem.create({ name: "Garlic Gyoza 6pcs", alt_name: "Garlic Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item26, price:4000.0, is_on_promotion:false}]) + menu_category1_menu_item26 = SimpleMenuItem.create({name: "Garlic Gyoza 6pcs", alt_name: "Garlic Gyoza 6pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item26, price:4000.0, is_on_promotion:false}]) #Green Onion Gyoza 6Pcs - menu_category1_menu_item7 = SimpleMenuItem.create({ name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item7, price:2500.0, is_on_promotion:false}]) + menu_category1_menu_item7 = SimpleMenuItem.create({name: "Green Onion Gyoza 6Pcs", alt_name: "Green Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item7, price:2500.0, is_on_promotion:false}]) #Kimchi Mayo Gyoza 6Pcs - menu_category1_menu_item8 = SimpleMenuItem.create({ name: "Kimchi Mayo Gyoza 6Pcs", alt_name: "Kimchi Mayo Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item8, price:3000.0, is_on_promotion:false}]) + menu_category1_menu_item8 = SimpleMenuItem.create({name: "Kimchi Mayo Gyoza 6Pcs", alt_name: "Kimchi Mayo Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item8, price:3000.0, is_on_promotion:false}]) #White Onion Gyoza 6Pcs - menu_category1_menu_item9 = SimpleMenuItem.create({ name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) + menu_category1_menu_item9 = SimpleMenuItem.create({name: "White Onion Gyoza 6Pcs", alt_name: "White Onion Gyoza 6Pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item9, price:3000.0, is_on_promotion:false}]) # Gyoza 3pcs menu_category1_menu_item0 = SimpleMenuItem.create({name: "Gyoza 3pcs", alt_name: "Gyoza 3pcs",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item0, price:1500.0, is_on_promotion:false}]) # Gyoza 2pcs menu_category1_menu_item1 = SimpleMenuItem.create({name: "Gyoza 2pcs", alt_name: "Gyoza 2pcs",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food }) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item1, price:1000.0, is_on_promotion:false}]) # Curry Gyoza 6pcs # menu_category1_menu_item3 = SimpleMenuItem.create({ name: "Curry Gyoza 6pcs", alt_name: "Curry Gyoza 6pcs", menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) # menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",menu_item: menu_category1_menu_item3, price:5000.0, is_on_promotion:false}]) @@ -447,49 +447,49 @@ menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "G puts "Osaka's menu setup" zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) zone2 = Zone.create({id:2, name: "H2", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone2, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) - table = Table.create({zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) + table = Table.create({zone: zone3, name:"Table", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"}) #Default Order Queue stations -order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) -order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0005','I0006','I0007','I0008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) -zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: true, printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004','I0005','I0006','I0007','I0008']), print_copy: true, cut_per_item: true, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0005','I0006','I0007','I0008']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) +zone_order_queue_station = OrderQueueStation.create({station_name: "K3", is_active: true, printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004','I0005','I0006','I0007','I0008']), print_copy: false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) # QueueStationZone zone_queue_station1 = OrderQueueProcessByZone.create({order_queue_station: order_queue_station1, zone: zone})