7 Commits

Author	SHA1	Message	Date
Rohan Mitchell	6d84cf7613	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	2012-11-01 11:02:02 +11:00
Rohan Mitchell	7dd42b7feb	Fix use of pickup_address and url fields with enterprises, checkout spec passes	2012-10-31 17:10:21 +11:00
Rohan Mitchell	773adca838	Display distributor details on product page when distributor is selected	2012-10-27 12:49:57 +11:00
Rohan Mitchell	8156da509e	Display distributor next collection time in checkout process	2012-07-02 14:32:53 +10:00
Rohan Mitchell	e0e566e625	Display distributor information on checkout address page	2012-06-26 16:04:59 +10:00
Andrew Spinks	f7372a80c2	add distributor to checkout	2012-04-09 09:56:37 +10:00
Andrew Spinks	b2b8bd0112	add selector for distributor in checkout. Not saving relation as yet.	2012-04-07 16:34:27 +10:00