Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-01-17 12:08:27 +06:30
parent 06686b06bb ef816a5969
commit 57f042aec2
1 changed files with 2 additions and 1 deletions
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -665,7 +665,8 @@ def self.get_item_query()
                     # "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("i.item_instance_code IS NOT NULL")
-  query = query.group("acc.title,mi.account_id,i.product_name").order("acc.title desc, mi.account_id desc")
+  query = query.group("acc.title,mi.account_id,i.product_name")
+               .order("acc.title desc, mi.account_id desc, i.unit_price asc")
 end

 def self.get_other_charges()