diff --git a/README.md b/README.md index 8655b6d9..495ab055 100755 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ruby 2.4.1p111 Osaka - Auth Token => rj0MJ0XI5GsKZehE => New + Auth Token => wu8YvlLmah0CL => New ##note : Old => rj0MJ0XI5GsKZehE => code2lab => Old @@ -23,7 +23,7 @@ ruby 2.4.1p111 BITP - Auth Token => rj0MJ0XI5GsKZehE => New + Auth Token => pZBHXEFbGNj/G => New ##note : Old => rj0MJ0XI5GsKZehE => code2lab => Old diff --git a/app/models/sale.rb b/app/models/sale.rb index f6aed95e..2e4cd1f2 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -706,7 +706,7 @@ def self.get_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 as unit_price,i.price as price,i.product_name as product_name, mc.name as" + + " mii.price as unit_price,i.price as price,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" +