git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed credit report

Browse Source
This commit is contained in:
NyanLinHtut
2020-01-10 10:41:42 +06:30
parent b742dfa2a0
commit 44d91024db
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/sale.rb
View File

@@ -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.present?
if order_source == "cashier" if order_source == "cashier"
credits = credits.where("order_sources.source IN (?)", ['cashier', 'emenu']) credits = credits.where("orders.source IN (?)", ['cashier', 'emenu'])
else else
credits = credits.where("order_sources.source = ?", order_source) credits = credits.where("orders.source = ?", order_source)
end end
end end
if filter == 'paid' 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' elsif filter == 'unpaid'
credits = credits.where("payments_for_credits IS NULL") credits = credits.where("payments_for_credits.sale_id IS NULL")
end end
if shift.present? if shift.present?