From 7c8b5def810f66c1561383faa5355ba254d2da21 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 28 Feb 2018 15:42:07 +0630
Subject: [PATCH] check product sale

---
 app/models/sale.rb                            | 4 ++--
 app/views/reports/product_sale/index.html.erb | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

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 @@
 
 									<tr>
 										<td>&nbsp;</td>
-										<% if !cate_arr.include?(sale.menu_category_id) %>	
 										<td><%= sale.menu_category_name %></td>
-										<% cate_arr.push(sale.menu_category_id) %>
-										<% else %>
-										<td>&nbsp;</td>
-										<% end %>
 										<td><%= sale.item_code rescue '-' %></td>
 										<td><%= sale.product_name rescue '-' %></td>
 										<td><%= sale.total_item rescue '-' %></td>