From c618ba3b2c58fd0dc5c9423f31ab4b1cbfcc1d4d Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Mon, 7 Sep 2020 13:37:59 -0700 Subject: [PATCH] style fixes --- app/controllers/spree/admin/shipping_methods_controller.rb | 7 ++++--- app/helpers/spree/admin/base_helper.rb | 6 ++++-- app/models/calculator/weight.rb | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/controllers/spree/admin/shipping_methods_controller.rb b/app/controllers/spree/admin/shipping_methods_controller.rb index ebf3e8e432..f3b00eab4b 100644 --- a/app/controllers/spree/admin/shipping_methods_controller.rb +++ b/app/controllers/spree/admin/shipping_methods_controller.rb @@ -88,9 +88,10 @@ module Spree :require_ship_address, :tag_list, :calculator_type, distributor_ids: [], calculator_attributes: [ - :id, :preferred_currency, :preferred_amount, :preferred_unit_from_list, :preferred_per_unit, :preferred_flat_percent, - :preferred_first_item, :preferred_additional_item, :preferred_max_items, - :preferred_minimal_amount, :preferred_normal_amount, :preferred_discount_amount + :id, :preferred_currency, :preferred_amount, :preferred_unit_from_list, + :preferred_per_unit, :preferred_flat_percent, :preferred_first_item, + :preferred_additional_item, :preferred_max_items, :preferred_minimal_amount, + :preferred_normal_amount, :preferred_discount_amount ] ) end diff --git a/app/helpers/spree/admin/base_helper.rb b/app/helpers/spree/admin/base_helper.rb index 833ece1bf7..f7741a3a1f 100644 --- a/app/helpers/spree/admin/base_helper.rb +++ b/app/helpers/spree/admin/base_helper.rb @@ -66,7 +66,8 @@ module Spree if field.end_with?('_from_list') && object.respond_to?("#{field}_values") list_values = object.__send__("#{field}_values") selected_value = object.__send__(field) - form.select(field, options_for_select(list_values, selected_value), preference_field_options(options)) + form.select(field, options_for_select(list_values, selected_value), + preference_field_options(options)) else form.text_field(field, preference_field_options(options)) end @@ -106,7 +107,8 @@ module Spree object.preferences.keys.map{ |key| form.label("preferred_#{key}", Spree.t(key.to_s.gsub("_from_list", "")) + ": ") + - preference_field_for(form, "preferred_#{key}", { type: object.preference_type(key) }, object) + preference_field_for(form, "preferred_#{key}", + { type: object.preference_type(key) }, object) }.join("
").html_safe end diff --git a/app/models/calculator/weight.rb b/app/models/calculator/weight.rb index aa479e7d09..55f8178c9c 100644 --- a/app/models/calculator/weight.rb +++ b/app/models/calculator/weight.rb @@ -73,12 +73,12 @@ module Calculator def convert_weight(value) return 0 unless value + if preferences[:unit] == "kg" value / 1000 elsif preferences[:unit] == "lb" value / 453.6 else - #TODO: handle this case without crashing? raise "Unknown unit preference" end end