Merge branch 'supplied-active-products-on-hand' of github.com:eaterprises/openfoodweb 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

config/database.yml

@@ -1,12 +1,8 @@
 development:
   adapter: postgresql
   encoding: unicode
-  #template: template0
-  #collate: en_US.UTF8
-  #ctype: en_US.UTF8
   database: open_food_web_dev
   pool: 5
-  host: localhost
   username: ofw
   password: f00d
 
@@ -15,7 +11,6 @@ test:
   encoding: unicode
   database: open_food_web_test
   pool: 5
-  host: localhost
   username: ofw
   password: f00d
 
@@ -26,4 +21,4 @@ production:
   database: open_food_web_prod
   pool: 5
   username: ofw
-  password: f00d
+  password: f00d

db/schema.rb

@@ -422,7 +422,6 @@ ActiveRecord::Schema.define(:version => 20130207043555) do
     t.string   "email"
     t.text     "special_instructions"
     t.integer  "distributor_id"
-    t.integer  "order_cycle_id"
     t.string   "currency"
     t.string   "last_ip_address"
   end

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