From 24284b436192ca7fc782c99581fdb34764546793 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 1 Dec 2017 15:15:58 +0630 Subject: [PATCH] total account discount for close shift sale --- app/models/shift_sale.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index 86499ab1..57816948 100755 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -121,7 +121,7 @@ class ShiftSale < ApplicationRecord "JOIN accounts acc ON acc.id = i.account_id" + " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id") if type == 'discount' - query = query.where("sales.shift_sale_id =? and sale_status = 'completed' and i.is_taxable = false and i.remark = 'Discount'", shift.id) + query = query.where("sales.shift_sale_id =? and sale_status = 'completed' and i.remark = 'Discount'", shift.id) .group("acc.title").order("acc.id") else query = query.where("sales.shift_sale_id =? and sale_status = 'completed'", shift.id)