From d2504d843331834c60ac7ae0f8d708723c4edb79 Mon Sep 17 00:00:00 2001 From: Thein Lin Kyaw Date: Tue, 21 Jul 2020 13:00:57 +0630 Subject: [PATCH] fix receipt detail report query --- app/models/sale.rb | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 76d5de6f..8ded4b4e 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1176,11 +1176,11 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range, shift, from, to, paymen end query = Sale.includes(:sale_items).select("sales.*, sale_payments.*") - .select("customers.customer_id, customers.name as customer_name, df.name, df.type") - .where("sale_status= 'completed' and sale_payments.payment_amount != 0 #{payment_type}") - .joins("INNER JOIN sale_payments on sale_payments.sale_id = sales.sale_id") - .joins("INNER JOIN bookings on bookings.sale_id = sales.sale_id") - .joins("LEFT JOIN dining_facilities df on df.id = bookings.dining_facility_id") + .select("customers.customer_id, customers.name as customer_name, dining_facilities.name, dining_facilities.type") + .joins("INNER JOIN sale_payments ON sale_payments.sale_id = sales.sale_id") + .joins("INNER JOIN bookings ON bookings.sale_id = sales.sale_id") + .joins("LEFT JOIN dining_facilities ON dining_facilities.id = bookings.dining_facility_id") + .completed.where.not(total_amount: 0) .group("sales.sale_id") if customer_filter.present? @@ -1208,14 +1208,11 @@ def self.get_shift_sales_by_receipt_no_detail(shift_sale_range, shift, from, to, .select("sales.*, SUM(sale_payments.payment_amount) AS payments_for_credits_amount") .select("dining_facilities.type AS table_type, dining_facilities.name AS table_name") .select("customers.customer_id, customers.name AS customer_name, customers.company AS customer_company") - .joins("INNRE JOIN bookings on bookings.sale_id = sales.sale_id") - .joins("LEFT JOIN dining_facilities df on df.id = bookings.dining_facility_id") - .joins("INNER JOIN sale_payments sp ON sp.sale_id = sales.sale_id") + .joins("INNER JOIN bookings ON bookings.sale_id = sales.sale_id") + .joins("LEFT JOIN dining_facilities on dining_facilities.id = bookings.dining_facility_id") .left_joins(:payments_for_credits) - .completed - .where.not(total_amount: 0) - .group(:sale_id) - .order(:receipt_date) + .completed.where.not(total_amount: 0) + .group(:sale_id).order(:receipt_date) if customer_filter.present? query = query.joins(sanitize_sql_array(["INNER JOIN customers ON customers.customer_id = sales.customer_id AND " +