From 6aab87a89d15024db3e3d214342a2e554135fd86 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 9 Jan 2018 12:04:56 +0630 Subject: [PATCH] update sale item report qty sum --- app/models/sale.rb | 2 +- app/views/reports/saleitem/index.html.erb | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 69aa930a..0b68bf49 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -654,7 +654,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.product_name as product_name, mc.name as" + + " i.unit_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" + diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index 4ad30d82..a96b80f8 100644 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -77,11 +77,14 @@ <% total_tax = 0 %> <% @sale_data.each do |sale| %> - + <% if sale.status_type != "Discount" && sale.status_type != "foc" total_qty += sale.total_item end %> - + <% if sale.status_type == "foc" && sale.price > 0 + total_qty += sale.total_item + end %> + <% if sale.status_type == "foc" && sale.grand_total < 0 total_item_foc += sale.grand_total*(-1) end %> @@ -127,9 +130,13 @@ <% count = count + 1 %> <% sub_total += sale.grand_total %> <% #sub_qty += sale.total_item %> - <% if sale.status_type != "Discount" && sale.status_type != "foc" + <% if sale.status_type!="Discount" && sale.status_type!="foc" sub_qty += sale.total_item end %> + <% if sale.status_type == "foc" && sale.price > 0 + sub_qty += sale.total_item + end %> + <% if count == value %>