Merge pull request #2166 from internetee/2165-ransack-fix

Fix ransack gem association response
This commit is contained in:
Timo Võhmar 2021-10-06 19:26:10 +03:00 committed by GitHub
commit f097de4a63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View file

@ -93,12 +93,12 @@ module Admin
def filter_by_receipt_date(invoices)
date_from_param = params[:q][:receipt_date_gteq] if params[:q][:receipt_date_gteq].present?
date_from = date_from_param ? Time.zone.parse(date_from_param) : -Float::INFINITY
date_from = date_from_param ? Time.zone.parse(date_from_param) : nil
date_until_param = params[:q][:receipt_date_lteq] if params[:q][:receipt_date_lteq].present?
date_until = date_until_param ? Time.zone.parse(date_from_param) : Float::INFINITY
date_until = date_until_param ? Time.zone.parse(date_until_param) : nil
invoices.where(account_activity: { created_at: date_from..date_until })
invoices.where(account_activities: { created_at: date_from..date_until })
end
end
end