diff --git a/app/models/sale.rb b/app/models/sale.rb index e2d1aff4..05442b1e 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1587,7 +1587,7 @@ end outstanding_query = "SELECT CASE WHEN SUM(sale_payments.outstanding_amount) < 0 THEN SUM(sale_payments.outstanding_amount) ELSE 0 END FROM sale_payments JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id - JOIN sales ON sale_audits.sale_id = sales.sale_id + JOIN sales ON sale_payments.sale_id = sales.sale_id WHERE sale_payments.outstanding_amount LIKE '%-%' AND sales.sale_status='completed'" if (!from.nil? && !to.nil?) && (from != "" && to!="") @@ -1603,7 +1603,7 @@ end sub_query = "SELECT (CASE WHEN SUM(sale_payments.payment_amount) > 0 THEN SUM(sale_payments.payment_amount) + (#{outstanding_query}) ELSE 0 END) FROM sale_payments INNER JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id - INNER JOIN sales ON sale_audits.sale_id = sales.sale_id + INNER JOIN sales ON sale_payments.sale_id = sales.sale_id WHERE sales.sale_status='completed'" if (!from.nil? && !to.nil?) && (from != "" && to!="") @@ -1758,7 +1758,7 @@ end outstanding_query = "SELECT CASE WHEN SUM(sale_payments.outstanding_amount) < 0 THEN SUM(sale_payments.outstanding_amount) ELSE 0 END FROM sale_payments JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id - JOIN sales ON sale_audits.sale_id = sales.sale_id + JOIN sales ON sale_payments.sale_id = sales.sale_id WHERE sale_payments.outstanding_amount LIKE '%-%' AND sales.sale_status='completed'" if (!from.nil? && !to.nil?) && (from != "" && to!="") @@ -1773,7 +1773,7 @@ end sub_query = SalePayment.select("(CASE WHEN SUM(sale_payments.payment_amount) > 0 THEN SUM(sale_payments.payment_amount) + (#{outstanding_query}) ELSE 0 END) as total_credit_payment") .joins(" JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id") - .joins(" JOIN sales ON sale_audits.sale_id = sales.sale_id") + .joins(" JOIN sales ON sale_payments.sale_id = sales.sale_id") .where("sales.sale_status='completed'") if (!from.nil? && !to.nil?) && (from != "" && to!="") @@ -1965,7 +1965,7 @@ end outstanding_query = "SELECT CASE WHEN SUM(sale_payments.outstanding_amount) < 0 THEN SUM(sale_payments.outstanding_amount) ELSE 0 END FROM sale_payments JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id - JOIN sales ON sale_audits.sale_id = sales.sale_id + JOIN sales ON sale_payments.sale_id = sales.sale_id WHERE sale_payments.outstanding_amount LIKE '%-%' AND sales.sale_status='completed'" if (!from.nil? && !to.nil?) && (from != "" && to!="") @@ -1981,7 +1981,7 @@ end sub_query = "SELECT (CASE WHEN SUM(sale_payments.payment_amount) > 0 THEN SUM(sale_payments.payment_amount) + (#{outstanding_query}) ELSE 0 END) FROM sale_payments INNER JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id - INNER JOIN sales ON sale_audits.sale_id = sales.sale_id + INNER JOIN sales ON sale_payments.sale_id = sales.sale_id WHERE sales.sale_status='completed'" if (!from.nil? && !to.nil?) && (from != "" && to!="")