From fdb1019ee210fbb0eff256313e91f1b7a1361a28 Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Thu, 17 Sep 2020 16:41:49 -0700 Subject: [PATCH] fix styles per rubocop --- .../spree/admin/shipping_methods_controller.rb | 3 +-- app/helpers/spree/admin/base_helper.rb | 11 +++++++---- app/models/calculator/weight.rb | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/controllers/spree/admin/shipping_methods_controller.rb b/app/controllers/spree/admin/shipping_methods_controller.rb index f3b00eab4b..b91f8432a9 100644 --- a/app/controllers/spree/admin/shipping_methods_controller.rb +++ b/app/controllers/spree/admin/shipping_methods_controller.rb @@ -84,8 +84,7 @@ module Spree def permitted_resource_params params.require(:shipping_method).permit( - :name, :description, :display_on, - :require_ship_address, :tag_list, :calculator_type, + :name, :description, :display_on, :require_ship_address, :tag_list, :calculator_type, distributor_ids: [], calculator_attributes: [ :id, :preferred_currency, :preferred_amount, :preferred_unit_from_list, diff --git a/app/helpers/spree/admin/base_helper.rb b/app/helpers/spree/admin/base_helper.rb index 7615f2b6c9..157762e823 100644 --- a/app/helpers/spree/admin/base_helper.rb +++ b/app/helpers/spree/admin/base_helper.rb @@ -113,10 +113,13 @@ module Spree object.preferences.keys.map { |key| preference_label = form.label("preferred_#{key}", - Spree.t(key.to_s.gsub("_from_list", "")) + ": ").html_safe - preference_field = preference_field_for(form, "preferred_#{key}", - { type: object.preference_type(key) }, object).html_safe - { :label => preference_label, :field => preference_field } + Spree.t(key.to_s.gsub("_from_list", "")) + ": ").html_safe + preference_field = preference_field_for( + form, + "preferred_#{key}", + { type: object.preference_type(key) }, object + ).html_safe + { label: preference_label, field: preference_field } } end diff --git a/app/models/calculator/weight.rb b/app/models/calculator/weight.rb index 085990f0ed..f4f451b785 100644 --- a/app/models/calculator/weight.rb +++ b/app/models/calculator/weight.rb @@ -14,9 +14,9 @@ module Calculator def set_preference(name, value) if name == :unit_from_list && !["kg", "lb"].include?(value) - self.calculable.errors.add(:preferred_unit_from_list, I18n.t(:calculator_preferred_unit_error)) + calculable.errors.add(:preferred_unit_from_list, I18n.t(:calculator_preferred_unit_error)) else - send self.class.preference_setter_method(name), value + __send__ self.class.preference_setter_method(name), value end end