From 970a9bb430968f9bf0e343e950a9281deb90359a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 23 Feb 2018 15:26:24 +0630
Subject: [PATCH] sale

---
 app/models/sale.rb | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index cd896f5f..54806964 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -861,27 +861,24 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
 end
 
 #product sale report query
-def self.get_product_item_query()
-  query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " +
-                     "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," +
-                     "i.remark as status_type,"+
-                     " i.unit_price,i.price as price,i.product_name as product_name, mc.name as" +
+def self.get_menu_item_query()
+  query = MenuItem.select("acc.id as account_id, acc.title as account_name, 
+                      i.item_instance_code as item_code, " +
+                     "i.qty as qty," +
+                     "i.product_name as product_name, 
+                     mc.name as" +
                      " menu_category_name,mc.id as menu_category_id ")
 
-  query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + 
-                     " JOIN menu_item_instances mii ON i.item_instance_code = mii.item_instance_code" +
-                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
-                     " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id" + 
-                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
-                     # "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.joins(" LEFT JOIN menu_item_instances mii ON i.item_instance_code = mii.item_instance_code" +
+                     " LEFT JOIN menu_items mi ON mi.id = mii.menu_item_id" + 
+                     " LEFT JOIN menu_categories mc ON mc.id = mi.menu_category_id" +
+                     " LEFT JOIN accounts acc ON acc.id = mi.account_id")
   query = query.group("acc.title,mi.account_id,mi.menu_category_id,mi.name,mii.price")
                .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, mii.price asc")
 end
 
 def self.get_by_items(shift_sale_range, shift, from, to)
-  query = self.get_product_item_query()
+  query = self.get_menu_item_query()
   
   puts "query"
   total_grand_total = 0