From d0eec1da3e07a953c3f8a81a2508ba089d4d0df4 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 23 Sep 2021 12:59:41 +0500 Subject: [PATCH 1/3] Fix ransack gem association response --- Gemfile | 2 +- Gemfile.lock | 4 ++-- app/controllers/admin/invoices_controller.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 0a9208904..fd14fd1fb 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'figaro', '~> 1.2' gem 'paper_trail', '~> 12.1' gem 'pg', '1.2.3' # 1.8 is for Rails < 5.0 -gem 'ransack', '~> 2.3' +gem 'ransack', '~> 2.4.2' gem 'truemail', '~> 2.4' # validates email by regexp, mail server existence and address existence gem 'validates_email_format_of', '1.6.3' # validates email against RFC 2822 and RFC 3696 diff --git a/Gemfile.lock b/Gemfile.lock index c6d187b15..b393a0894 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -560,7 +560,7 @@ DEPENDENCIES que que-web rails (~> 6.1.4) - ransack (~> 2.3) + ransack (~> 2.4.2) rest-client rexml sass-rails @@ -579,4 +579,4 @@ DEPENDENCIES wkhtmltopdf-binary (~> 0.12.5.1) BUNDLED WITH - 2.2.26 + 2.2.27 diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb index 96a106d18..fbee66c14 100644 --- a/app/controllers/admin/invoices_controller.rb +++ b/app/controllers/admin/invoices_controller.rb @@ -98,7 +98,7 @@ module Admin 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 }) + invoices.where(account_activities: { created_at: date_from..date_until }) end end end From 1371d9e159d3706125613b0a40204dc9341040df Mon Sep 17 00:00:00 2001 From: dinsmol Date: Wed, 6 Oct 2021 12:03:59 +0300 Subject: [PATCH 2/3] fixed receipt date filter error --- app/controllers/admin/invoices_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb index fbee66c14..96988a464 100644 --- a/app/controllers/admin/invoices_controller.rb +++ b/app/controllers/admin/invoices_controller.rb @@ -96,7 +96,7 @@ module Admin 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 + date_until = date_until_param ? Time.zone.parse(date_until_param) : Float::INFINITY invoices.where(account_activities: { created_at: date_from..date_until }) end From 095b891de901ff463c2c37724c5d5e1061b6bd53 Mon Sep 17 00:00:00 2001 From: dinsmol Date: Wed, 6 Oct 2021 12:33:33 +0300 Subject: [PATCH 3/3] fixed ranges error --- app/controllers/admin/invoices_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb index 96988a464..68db492d8 100644 --- a/app/controllers/admin/invoices_controller.rb +++ b/app/controllers/admin/invoices_controller.rb @@ -93,10 +93,10 @@ 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_until_param) : Float::INFINITY + date_until = date_until_param ? Time.zone.parse(date_until_param) : nil invoices.where(account_activities: { created_at: date_from..date_until }) end