From 32aa3f581d3eadb53ff9fe821d7c7f3a591ffc55 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 30 Nov 2017 17:51:30 +0630 Subject: [PATCH] update paymentmenthd for foc --- app/controllers/reports/payment_method_controller.rb | 2 -- app/models/sale.rb | 9 +++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb index 56c6c44c..bbff8900 100644 --- a/app/controllers/reports/payment_method_controller.rb +++ b/app/controllers/reports/payment_method_controller.rb @@ -21,8 +21,6 @@ class Reports::PaymentMethodController < BaseReportController end @payment_type = params[:payment_type] @sale_data,@pyament_method = Sale.get_payment_method_by_shift(@shift_sale_range,@shift,from,to,@payment_type) - puts @sale_data.to_json - puts "sssssssssssss" @from = from @to = to diff --git a/app/models/sale.rb b/app/models/sale.rb index 3bdaa8af..48fbdc9b 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -519,10 +519,11 @@ def self.daily_sales_list(from,to) SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount, SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount, SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount, - 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") + 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 ? 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')") daily_total = Array.new @@ -562,7 +563,7 @@ def self.daily_sales_list(from,to) :grand_total => grand_total, :old_grand_total => old_grand_total, :void_amount => void_amount, - :rounding_adj => sale.rounding_adj} + :rounding_adj => sale.rounding_adj} daily_total.push(total) end