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

Browse Source
This commit is contained in:
Aung Myo
2018-01-23 13:13:01 +06:30
parent 65292af9cb 05eb068e38
commit 8d2a928456
11 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/order.rb
View File

@@ -145,6 +145,9 @@ class Order < ApplicationRecord
set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity], "price"=>set_item[:price]})
end
end
set_order_items = set_order_items.to_json
else
set_order_items = nil
end
# not insert with price 0
@@ -157,7 +160,7 @@ class Order < ApplicationRecord
# end
OrderItem.processs_item(menu_item[:item_code], item[:item_instance_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id],
item[:quantity],menu_item[:price], item[:options], set_order_items.to_json, self.id,
item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
self.employee_name, menu_item[:taxable])
#end

4
app/models/sale.rb
View File

@@ -98,7 +98,7 @@ class Sale < ApplicationRecord
order.order_items.each do |item|
add_item(item)
if item.set_menu_items != "[]"
if !item.set_menu_items.nil?
add_sub_item(item.set_menu_items)
end
end
@@ -147,7 +147,7 @@ class Sale < ApplicationRecord
items.each do |item|
add_item(item)
if item.set_menu_items != "[]"
if !item.set_menu_items.nil?
add_sub_item(item.set_menu_items)
end