From a53223aefc29b4ba6b3c098788f4fa851d4395e4 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 19 May 2020 19:30:37 +0100 Subject: [PATCH] Convert relation to array before using array only method sort_by! --- app/controllers/admin/enterprises_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb index f1b4887f6a..ac2762cbf0 100644 --- a/app/controllers/admin/enterprises_controller.rb +++ b/app/controllers/admin/enterprises_controller.rb @@ -181,10 +181,10 @@ module Admin enterprise_payment_methods = @enterprise.payment_methods.to_a enterprise_shipping_methods = @enterprise.shipping_methods.to_a # rubocop:disable Style/TernaryParentheses - @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user).sort_by! do |pm| + @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user).to_a.sort_by! do |pm| [(enterprise_payment_methods.include? pm) ? 0 : 1, pm.name] end - @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user).sort_by! do |sm| + @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user).to_a.sort_by! do |sm| [(enterprise_shipping_methods.include? sm) ? 0 : 1, sm.name] end # rubocop:enable Style/TernaryParentheses