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

add receipt no report and bug fixing

Browse Source
This commit is contained in:
Yan
2017-06-12 12:04:12 +06:30
parent b6bba9ecd4
commit ca2dc181d6
5 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/sale_item.rb
View File

@@ -35,22 +35,22 @@ class SaleItem < ApplicationRecord
beverage_prices=0
sale_items.each do |si|
food_price = get_food_price(si.sale_item_id)
beverage_price = get_beverage_price(si.sale_item_id)
food_prices += food_price
beverage_prices += beverage_price
food_price = self.get_food_price(si.sale_item_id)
beverage_price = self.get_beverage_price(si.sale_item_id)
puts food_price
# food_prices = food_prices + food_price.price
# beverage_prices = beverage_prices + beverage_price.price
end
return food_prices, beverage_prices
end
def get_food_price(sale_item_id)
def self.get_food_price(sale_item_id)
food_price=SaleItem.select("sale_items.price")
.joins("left join menu_items on menu_items.item_code = sale_items.product_code")
.where("sale_items.sale_item_id=? and menu_items.account_id=0", sale_item_id)
end
def get_beverage_price(sale_item_id)
def self.get_beverage_price(sale_item_id)
beverage_price=SaleItem.select("sale_items.price")
.joins("left join menu_items on menu_items.item_code = sale_items.product_code")
.where("sale_items.sale_item_id=? and menu_items.account_id=1", sale_item_id)