git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill

Browse Source
This commit is contained in:
phyusin
2018-02-09 14:04:36 +06:30
parent 88a3deca30 19e9a941c8
commit c124a5fb77
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/origami/home_controller.rb
View File

@@ -73,6 +73,7 @@ class Origami::HomeController < BaseOrigamiController
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
item.price = item.price.to_f + instance_item["price"].to_f
end
item.set_menu_items = arr_instance_item_sets
end

1
app/controllers/origami/rooms_controller.rb
View File

@@ -67,6 +67,7 @@ class Origami::RoomsController < BaseOrigamiController
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
item.price = item.price.to_f + instance_item["price"].to_f
end
item.set_menu_items = arr_instance_item_sets
end