From b181d70a9e713a2f13edbf66a7431aa602894d4a Mon Sep 17 00:00:00 2001 From: phyusin Date: Mon, 16 Jul 2018 10:00:48 +0630 Subject: [PATCH] change query for credit sales --- app/models/sale.rb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 5120605f..dbba754f 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1100,29 +1100,27 @@ def self.get_shift_sales_by_receipt_no_detail(shift_sale_range,shift,from,to,pay end def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter) - puts "filter" - puts filter sub_query = "SELECT (CASE WHEN SUM(payment_amount) > 0 THEN DATE_FORMAT(CONVERT_TZ(sale_payments.created_at,'+00:00','+06:30'),'%d %b %y %h:%i%p') ELSE '-' END) - FROM SXRestaurants_development.`sale_payments` - INNER JOIN SXRestaurants_development.sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id + FROM `sale_payments` + INNER JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id WHERE sale_audits.sale_id = s.sale_id" sub_query1 = "SELECT (CASE WHEN SUM(payment_amount) > 0 THEN SUM(payment_amount) ELSE 0 END) - FROM SXRestaurants_development.`sale_payments` - INNER JOIN SXRestaurants_development.sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id + FROM `sale_payments` + INNER JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id WHERE sale_audits.sale_id = s.sale_id" sub_query2 = "SELECT (CASE WHEN shift_closed_at IS NOT NULL AND credit_payment > 0 THEN CONCAT(DATE_FORMAT(CONVERT_TZ(shift_started_at,'+00:00','+06:30'),'%d %b %y %h:%i%p'),' - ',DATE_FORMAT(CONVERT_TZ(shift_closed_at,'+00:00','+06:30'),'%d %b %y %h:%i%p')) ELSE '-' END) - FROM SXRestaurants_development.shift_sales + FROM shift_sales WHERE shift_sales.id = s.shift_sale_id" sub_query3 = "SELECT (CASE WHEN shift_closed_at IS NOT NULL AND credit_payment > 0 THEN employees.name ELSE '-' END) - FROM SXRestaurants_development.shift_sales - INNER JOIN SXRestaurants_development.employees ON employees.id=shift_sales.employee_id + FROM shift_sales + INNER JOIN employees ON employees.id=shift_sales.employee_id WHERE shift_sales.id = s.shift_sale_id" filter_check = ""