From ef43e9aff3d615f69fe5cd737c48c168a336f30b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 30 May 2018 10:44:50 +0630 Subject: [PATCH] salitem query original --- app/models/sale_item.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index d69782cd..0da5705e 100755 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -164,10 +164,10 @@ class SaleItem < ApplicationRecord def self.get_all_sale_items(sale_id) sale_items = SaleItem.select("sale_id,product_code,item_instance_code, product_name,product_alt_name,account_id,status,remark, - (CASE WHEN (qty > 0 AND remark IS NULL) OR (status='promotion' AND remark = 'promotion nett price') THEN SUM(qty) ELSE qty END) as qty, + (CASE WHEN (qty > 0 AND remark IS NULL) THEN SUM(qty) ELSE qty END) as qty, unit_price, taxable_price, - (CASE WHEN (price > 0 AND remark IS NULL) OR (status='promotion' AND remark = 'promotion nett price') THEN SUM(price) ELSE price END) as price, + (CASE WHEN (price > 0 AND remark IS NULL) THEN SUM(price) ELSE price END) as price, is_taxable") .where("sale_id = ?",sale_id) .order("product_name asc")