From 24d247f4da560615a8f7f523d054130d7573f1c8 Mon Sep 17 00:00:00 2001 From: dinsmol Date: Thu, 26 Aug 2021 22:33:30 +0300 Subject: [PATCH] fixed codeclimate errors --- app/controllers/admin/invoices_controller.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb index 9e0c83efe..8f05521d8 100644 --- a/app/controllers/admin/invoices_controller.rb +++ b/app/controllers/admin/invoices_controller.rb @@ -33,8 +33,6 @@ module Admin end def index - params[:q] ||= {} - invoices = filter_by_status invoices = filter_by_receipt_date(invoices) @@ -95,13 +93,14 @@ module Admin def filter_by_receipt_date(invoices) if params[:q][:receipt_date_gteq].present? - invoices = invoices.where(account_activity: - { created_at: Time.parse(params[:q][:receipt_date_gteq])..Float::INFINITY }) + date_from = Time.zone.parse(params[:q][:receipt_date_gteq]) + invoices = invoices.where(account_activity: { created_at: date_from..Float::INFINITY }) end - return invoices unless params[:q][:receipt_date_lteq].present? + return invoices if params[:q][:receipt_date_lteq].blank? - invoices.where(account_activity: { created_at: -Float::INFINITY..Time.parse(params[:q][:receipt_date_lteq]) }) + date_until = Time.zone.parse(params[:q][:receipt_date_lteq]) + invoices.where(account_activity: { created_at: -Float::INFINITY..date_until }) end end end