diff --git a/app/models/sale.rb b/app/models/sale.rb index 2138405c..e433a999 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -862,8 +862,8 @@ def self.get_menu_item_query(order_by) " LEFT JOIN accounts acc ON acc.id = menu_items.account_id" + " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" + " LEFT JOIN sales s ON s.sale_id = si.sale_id") - .group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END)") - .order("menu_items.menu_category_id #{order_by}, si.qty #{order_by}") + .group("si.qty, mc.id, menu_items.name, (CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END)") + .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}") end #product sale report query diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb index eb797122..b8ab6598 100755 --- a/app/views/reports/product_sale/index.html.erb +++ b/app/views/reports/product_sale/index.html.erb @@ -69,12 +69,7 @@