diff --git a/app/models/sale.rb b/app/models/sale.rb index 11d67543..fc2a761b 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -617,7 +617,7 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty end -def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) +def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type) if payment_type.blank? payment_type = '' @@ -633,14 +633,14 @@ def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type) query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a) + .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a) .group("sale_taxes.tax_name") .order("sale_taxes.sale_tax_id asc") else query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' and sales.shift_sale_id in (?)",from,to,shift_sale_range.to_a) + .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift_sale_range.to_a) .group("sale_taxes.tax_name") .order("sale_taxes.sale_tax_id asc") end diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index ac20f446..cf8729f3 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -49,7 +49,7 @@
- +

Role Features