Merge branch 'master' into supplied-active-products-on-hand

app/controllers/spree/orders_controller_decorator.rb

@@ -1,3 +1,5 @@
+require 'spree/core/controller_helpers/order_decorator'
+
 Spree::OrdersController.class_eval do
   before_filter :populate_order_distributor,  :only => :populate
   before_filter :populate_order_count_on_hand,  :only => :populate

spec/lib/open_food_web/order_cycle_form_applicator_spec.rb

@@ -160,7 +160,7 @@ module OpenFoodWeb
         applicator.send(:update_exchange, sender.id, receiver.id, {:variant_ids => [variant1.id, variant3.id]})
 
         exchange.reload
-        exchange.variant_ids.should == [variant1.id, variant3.id]
+        exchange.variant_ids.sort.should == [variant1.id, variant3.id].sort
         applicator.send(:touched_exchanges).should == [exchange]
       end
     end