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

Other Charges added to CloseCashierPdf and SaleItemsPdf

Browse Source
This commit is contained in:
Zoey
2019-06-04 11:29:24 +06:30
parent 77103d0780
commit f4bbcdccea
6 changed files with 124 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/sale.rb
View File

@@ -1016,8 +1016,8 @@ def self.get_item_query(type)
query = query.joins(" JOIN accounts acc ON acc.id = i.account_id")
query = query.where("#{sale_type}")
query = query.group("acc.title,i.account_id,i.menu_category_code,i.item_instance_code,i.product_name,i.unit_price")
.order("acc.title desc, i.account_id desc, SUM(i.qty) desc, i.menu_category_code desc, i.unit_price asc")
# query = query.order("SUM(i.qty) desc")
.order("acc.title desc, i.account_id desc, i.menu_category_code desc, i.item_instance_code asc, SUM(i.qty) desc, i.unit_price asc")
# query = query.order("i.menu_category_name asc, SUM(i.qty) desc")
end
def self.get_other_charges()