raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address Code Climate (rubocop) issues

Browse Source
This commit is contained in:
Pau Perez
2019-07-04 13:40:27 +02:00
parent 4a67ffab25
commit ee301c5e2f
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/open_food_network/order_grouper.rb
View File

@@ -24,9 +24,12 @@ module OpenFoodNetwork
sorted_groups.each do |property, items_by_property|
branch[property] = build_tree(items_by_property, remaining_rules)
unless rule[:summary_columns].nil? || is_leaf_node(branch[property])
branch[property][:summary_row] = { items: items_by_property, columns: rule[:summary_columns] }
end
next if rule[:summary_columns].nil? || is_leaf_node(branch[property])
branch[property][:summary_row] = {
items: items_by_property,
columns: rule[:summary_columns]
}
end
branch

23
lib/open_food_network/orders_and_fulfillments_report.rb
View File

@@ -97,10 +97,10 @@ module OpenFoodNetwork
proc { |_line_items| "" }
]
},
{
group_by: proc { |line_item| line_item.order.distributor },
sort_by: proc { |distributor| distributor.name }
}
{
group_by: proc { |line_item| line_item.order.distributor },
sort_by: proc { |distributor| distributor.name }
}
]
when "order_cycle_distributor_totals_by_supplier"
[
@@ -311,17 +311,24 @@ module OpenFoodNetwork
end
def total_units(line_items)
return " " if line_items.map{ |li| li.unit_value.nil? }.any?
return " " if not_all_have_unit?(line_items)
total_units = line_items.sum do |li|
product = find_variant(li.variant_id).product
scale_factor = ( product.variant_unit == 'weight' ? 1000 : 1 )
li.quantity * li.unit_value / scale_factor
li.quantity * li.unit_value / scale_factor(product)
end
total_units.round(3)
end
def not_all_have_unit?(line_items)
line_items.map { |li| li.unit_value.nil? }.any?
end
def scale_factor(product)
product.variant_unit == 'weight' ? 1000 : 1
end
# Returns the variant with the given id, including soft-deleted ones
def find_variant(id)
Spree::Variant.unscoped.find(id)