From e26069782df151b5ad914db2d458ff0480578a14 Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 23 Jul 2018 17:59:53 +0630 Subject: [PATCH] check query for credit payment --- app/models/sale_payment.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index df3969a8..48c28f05 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -864,9 +864,14 @@ class SalePayment < ApplicationRecord .joins("INNER JOIN customers c ON c.customer_id = s.customer_id") .joins("INNER JOIN sale_orders so ON so.sale_id = s.sale_id") .joins("INNER JOIN orders o ON o.order_id = so.order_id") - .where("(CASE WHEN (s.grand_total + s.amount_changed)=(select SUM(payment_amount) FROM sale_payments WHERE sale_id=s.sale_id AND payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' END) and s.sale_status = 'completed' and o.source='#{params[:type]}' #{receipt_no} #{customer}") - .group("s.receipt_no") - .order("s.receipt_date ASC, s.receipt_no ASC") + .where("(CASE WHEN (s.grand_total + s.amount_changed)=(select SUM(payment_amount) FROM sale_payments WHERE sale_id=s.sale_id AND payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' END) and s.sale_status = 'completed' #{receipt_no} #{customer}") + if params[:type] == "cashier" + query = query.where("and o.source='#{params[:type]}' OR 0.source='emenu'") + else + query = query.where("and o.source='#{params[:type]}'") + end + query = query.group("s.receipt_no") + .order("s.receipt_date ASC, s.receipt_no ASC") return query end