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

menu item checked

Browse Source
This commit is contained in:
phyusin
2018-12-26 10:37:17 +06:30
parent 3523acc2eb
commit b557e17558
5 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/sale.rb
View File

@@ -252,8 +252,12 @@ class Sale < ApplicationRecord
#save sale_audit
sale_item = SaleItem.new
menu_category = MenuCategory.joins(" JOIN menu_items mi ON mi.menu_category_id = menu_categories.id")
.where("mi.item_code = '#{item.item_code}'")
.first()
#pull
sale_item.menu_category_code = menu_category.code
sale_item.menu_category_name = menu_category.name
sale_item.product_code = item.item_code
sale_item.item_instance_code = item.item_instance_code
sale_item.product_name = item.item_name
@@ -1006,8 +1010,8 @@ def self.get_item_query(type)
# "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
query = query.where("#{sale_type}")
query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name,i.unit_price")
.order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, i.unit_price asc")
query = query.group("acc.title,i.account_id,i.menu_category_code,i.product_name,i.unit_price")
.order("acc.title desc, i.account_id desc, i.menu_category_code desc, i.unit_price asc")
end
def self.get_other_charges()