From 5ca81115edff1feea186fffd61b02eea78b7c2ff Mon Sep 17 00:00:00 2001 From: dinsmol Date: Mon, 30 Aug 2021 08:40:08 +0300 Subject: [PATCH] fixed codeclimate error --- app/controllers/admin/invoices_controller.rb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb index 283f60ce3..0e154dff0 100644 --- a/app/controllers/admin/invoices_controller.rb +++ b/app/controllers/admin/invoices_controller.rb @@ -92,16 +92,12 @@ module Admin end def filter_by_receipt_date(invoices) - date_from = if params[:q][:receipt_date_gteq].present? - Time.zone.parse(params[:q][:receipt_date_gteq]) - else - -Float::INFINITY - end - date_until = if params[:q][:receipt_date_lteq].present? - Time.zone.parse(params[:q][:receipt_date_lteq]) - else - Float::INFINITY - end + 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_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 + invoices.where(account_activity: { created_at: date_from..date_until }) end end