From 44d91024db36fef27ef50cb0045dce96b640716b Mon Sep 17 00:00:00 2001 From: NyanLinHtut Date: Fri, 10 Jan 2020 10:41:42 +0630 Subject: [PATCH] fixed credit report --- app/models/sale.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 4da248df..dce922f7 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1280,16 +1280,16 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter, if order_source.present? if order_source == "cashier" - credits = credits.where("order_sources.source IN (?)", ['cashier', 'emenu']) + credits = credits.where("orders.source IN (?)", ['cashier', 'emenu']) else - credits = credits.where("order_sources.source = ?", order_source) + credits = credits.where("orders.source = ?", order_source) end end if filter == 'paid' - credits = credits.where("payments_for_credits IS NOT NULL") + credits = credits.where("payments_for_credits.sale_id IS NOT NULL") elsif filter == 'unpaid' - credits = credits.where("payments_for_credits IS NULL") + credits = credits.where("payments_for_credits.sale_id IS NULL") end if shift.present?