Merge branch 'master' into enterprises

Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb

lib/open_food_web/group_buy_report.rb

@@ -38,8 +38,8 @@ module OpenFoodWeb
           end
 
           # Sum quantities for each product (Total line)
-          sum_quantities = line_items_by_product.sum { |li| li.variant.weight * li.quantity }
-          sum_max_quantities = line_items_by_product.sum { |li| li.variant.weight * (li.max_quantity || 0) } 
+          sum_quantities = line_items_by_product.sum { |li| (li.variant.weight || 0) * li.quantity }
+          sum_max_quantities = line_items_by_product.sum { |li| (li.variant.weight || 0) * (li.max_quantity || 0) }
           variants_and_quantities << GroupBuyProductRow.new(product, sum_quantities, sum_max_quantities)
         end
       end

lib/open_food_web/order_grouper.rb

@@ -0,0 +1,58 @@
+module OpenFoodWeb
+
+  class OrderGrouper
+    def initialize(rules, column_constructors)
+      @rules = rules
+      @column_constructors = column_constructors
+    end
+
+    def build_tree(items, remaining_rules)
+      rules = remaining_rules.clone
+      unless rules.empty?
+        rule = rules.delete_at(0) # Remove current rule for subsequent groupings
+        group_and_sort(rule, rules, items)
+      else
+        items
+      end
+    end
+
+    def group_and_sort(rule, remaining_rules, items)
+      branch = {}
+      groups = items.group_by { |item| rule[:group_by].call(item) }
+      sorted_groups = groups.sort_by { |key, value| rule[:sort_by].call(key) }
+      sorted_groups.each do |property,items_by_property|
+        branch[property] = build_tree(items_by_property, remaining_rules)
+        branch[property][:summary_row] = { items: items_by_property, columns: rule[:summary_columns] } unless rule[:summary_columns] == nil || is_leaf_node(branch[property])
+      end
+      branch
+    end
+
+    def build_table(groups)
+      rows = []
+      unless is_leaf_node(groups)
+        groups.each do |key, group|
+          unless key == :summary_row
+            build_table(group).each { |g| rows << g }
+          else
+            rows << group[:columns].map { |cols| cols.call(group[:items]) }
+          end
+        end
+      else
+        rows << @column_constructors.map { |column_constructor| column_constructor.call(groups) }
+      end
+      rows
+    end
+
+    def table(items)
+      tree = build_tree(items,@rules)
+      table = build_table(tree)
+      table
+    end
+    
+    private
+    
+    def is_leaf_node(node)
+      node.is_a? Array
+    end
+  end
+end