raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

style fixes

Browse Source
This commit is contained in:
Andy Brett
2020-09-07 13:37:59 -07:00
parent 5a5cbbd318
commit c618ba3b2c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/spree/admin/shipping_methods_controller.rb
View File

@@ -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

6
app/helpers/spree/admin/base_helper.rb
View File

@@ -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("<br />").html_safe
end

2
app/models/calculator/weight.rb
View File

@@ -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