From f82de95d6fc0e08df54e14963b1f995092294fbc Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 22 Jun 2018 14:54:47 +0630 Subject: [PATCH] update sale tax for dalily sale report with inclusive tax --- app/models/sale_tax.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/sale_tax.rb b/app/models/sale_tax.rb index 7a42905a..216a0267 100755 --- a/app/models/sale_tax.rb +++ b/app/models/sale_tax.rb @@ -6,7 +6,10 @@ class SaleTax < ApplicationRecord belongs_to :sale def self.get_tax(from,to) - query = SaleTax.select("sale_taxes.tax_name,SUM(sale_taxes.tax_payable_amount) as tax_amount").joins("join sales on sales.sale_id = sale_taxes.sale_id").where("sale_status = ? AND sales.receipt_date between ? and ? AND total_amount != 0", 'completed', from, to).group("sale_taxes.tax_name") + query = SaleTax.select("sale_taxes.tax_name,SUM(sale_taxes.tax_payable_amount) as tax_amount") + .joins("join sales on sales.sale_id = sale_taxes.sale_id") + .where("sale_status = ? AND sales.receipt_date between ? and ? AND total_amount != 0 AND inclusive = 0", 'completed', from, to) + .group("sale_taxes.tax_name") end private