From 2e9847986da1c73aa9bd0d7824226ba06d46a64a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 30 Nov 2017 17:58:42 +0630 Subject: [PATCH] update paymentmenthd for foc --- app/models/sale.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 48fbdc9b..55f6f516 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -522,7 +522,6 @@ def self.daily_sales_list(from,to) SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount, SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount") .joins("join (select * from sale_payments group by sale_payments.sale_id, sale_payments.payment_method) sale_payments on sale_payments.sale_id = sales.sale_id") - # .where("sale_status = ? AND sales.receipt_date between ? and ? AND total_amount != 0", 'completed', from, to) .where("sale_status = ? AND sales.receipt_date between ? and ? ", 'completed', from, to) .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')")