mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-24 20:36:49 +00:00
fix styles per rubocop
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user