fixed conflit

app/models/sale.rb

@@ -1127,6 +1127,15 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type,accou
   return query,other_charges, product, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
 end
 
+def self.get_shift_sale_items(sh_id)
+  query = Sale.select("sales.shift_sale_id as shift_sale_id, i.account_id as account_id, acc.title as account_name, i.item_instance_code as item_code, i.menu_category_name, i.menu_category_code as menu_category_id, i.product_name as product_name, i.unit_price, i.price as price, i.qty as qty, SUM(i.qty) as total_item, SUM(i.qty * i.unit_price) as grand_total, i.status as status_type, i.remark as remark")
+              .joins("JOIN sale_items i on i.sale_id = sales.sale_id")
+              .joins("JOIN accounts acc on acc.id = i.account_id")
+              .where("sales.shift_sale_id=?", sh_id)
+              .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, i.menu_category_code desc, i.unit_price asc")
+end
+
 def self.get_product_sale()
   query = Sale.select("i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item," +