From f8146fb946db98d8609058d6dd1eb12724fa987e Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 10 Jul 2020 14:49:55 +0100 Subject: [PATCH] Adapt finders to rails 4 --- .../spree/admin/orders/customer_details_controller.rb | 2 +- app/controllers/spree/admin/resource_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/spree/admin/orders/customer_details_controller.rb b/app/controllers/spree/admin/orders/customer_details_controller.rb index 3239ffff01..8ad0c7ea28 100644 --- a/app/controllers/spree/admin/orders/customer_details_controller.rb +++ b/app/controllers/spree/admin/orders/customer_details_controller.rb @@ -51,7 +51,7 @@ module Spree end def load_order - @order = Order.find_by_number!(params[:order_id], include: :adjustments) + @order = Order.find_by!({ number: params[:order_id] }, include: :adjustments) end def check_authorization diff --git a/app/controllers/spree/admin/resource_controller.rb b/app/controllers/spree/admin/resource_controller.rb index fce4dc1e4c..00a36c81dc 100644 --- a/app/controllers/spree/admin/resource_controller.rb +++ b/app/controllers/spree/admin/resource_controller.rb @@ -178,7 +178,7 @@ module Spree return nil if parent_data.blank? @parent ||= parent_data[:model_class]. - public_send("find_by_#{parent_data[:find_by]}", params["#{model_name}_id"]) + public_send("find_by", parent_data[:find_by] => params["#{model_name}_id"]) instance_variable_set("@#{model_name}", @parent) end