merge with aung myo

2017-11-06 13:45:26 +06:30
parent 2e0b2b823a ce49f81440
commit 7e19dbc1b6
6 changed files with 60 additions and 16 deletions
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -614,6 +614,7 @@ def self.get_item_query()
                         " 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.unit_price > 0")
    query = query.group('i.product_code ').order("mi.account_id, mi.menu_category_id")