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

discount updated

Browse Source
This commit is contained in:
Yan
2017-06-21 20:30:12 +06:30
parent e3b3ff76b2
commit 2525bfbdd9
6 changed files with 331 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/menu_item.rb
View File

@@ -24,6 +24,7 @@ class MenuItem < ApplicationRecord
if (!mt_instance.nil?)
menu_item = MenuItem.find(mt_instance.menu_item_id)
menu_item_hash[:type] = menu_item.type
menu_item_hash[:account_id] = menu_item.account_id
menu_item_hash[:item_code] = menu_item.item_code
menu_item_hash[:item_instance_code] = mt_instance.item_instance_code
menu_item_hash[:name] = menu_item.name.to_s + " - " + mt_instance.item_instance_name.to_s

2
app/models/order.rb
View File

@@ -82,7 +82,7 @@ class Order < ApplicationRecord
set_order_items
end
OrderItem.processs_item(menu_item[:item_code], menu_item[:name], menu_item[:account_id]
OrderItem.processs_item(menu_item[:item_code], menu_item[:name], menu_item[:account_id],
item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
self.employee_name)