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)