From b9d4f43e77989c08d93368c38540576bbfb7e54c Mon Sep 17 00:00:00 2001 From: yarzar_code Date: Wed, 9 Sep 2020 11:17:34 +0630 Subject: [PATCH] daily sale foc fixed --- app/models/sale.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 4f18176a..860aaa75 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -764,7 +764,7 @@ class Sale < ApplicationRecord SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount") .sale_payments_with_audit_except_void_between(from, to) .where("(sale_status = ? OR sale_status = ?) AND sales.receipt_date between ? AND ? ", 'completed', 'void', from, to) - .group("sale_id").to_sql + .group("sale_id") sale_taxes = Sale.select('sales.sale_id, sale_taxes.tax_name') .joins(:sale_taxes) @@ -789,13 +789,13 @@ class Sale < ApplicationRecord (IFNULL(SUM(case when (sale_status='completed') then grand_total else 0 end),0)) + (IFNULL(SUM(case when (sale_status='completed') then total_discount else 0 end),0)) as gross_sale, CAST((CONVERT_TZ(receipt_date,'+00:00','+06:30')) AS DATE) as sale_date, #{payment_methods.map { |method| pm = method == 'paypar' ? 'redeem' : method; "SUM(`#{pm}`) as `#{pm}`"}.push('').join(', ')} - SUM(cash_amount) as cash_amount, - SUM(credit_amount) as credit_amount, - SUM(foc_amount) as foc_amount + SUM(`cash_amount`) as `cash_amount`, + SUM(`credit_amount`) as `credit_amount`, + SUM(`foc_amount`) as `foc_amount` FROM ( - #{sales} + #{sales.to_sql} ) as s - JOIN (#{sale_taxes.to_sql}) AS st ON s.sale_id = st.sale_id + LEFT JOIN (#{sale_taxes.to_sql}) AS st ON s.sale_id = st.sale_id GROUP BY DATE(CONVERT_TZ(receipt_date,'+00:00','+06:30'))").to_hash.map(&:symbolize_keys) return daily_total end